Skip to content

Commit

Permalink
reformated
Browse files Browse the repository at this point in the history
  • Loading branch information
adranwit committed Mar 28, 2019
1 parent fb8f9b0 commit 93719dd
Show file tree
Hide file tree
Showing 59 changed files with 3,508 additions and 3,698 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## March 18 2019 0.34.1
## March 28 2019 0.34.2
* Patched deployment discovery
* Minor patches

## March 18 2019 0.34.0
* Added vc/git service to use go client, (original vc service uses SSH scraping)
Expand Down
5 changes: 1 addition & 4 deletions bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ import (
_ "github.com/adrianwit/fsc"
_ "github.com/adrianwit/mgc"


//cgo _ "github.com/alexbrainman/odbc"
//cgo _"github.com/mattn/go-oci8"


_ "github.com/viant/endly/gen/static"
_ "github.com/viant/endly/shared/static" //load external resource like .csv .json files to mem storage

Expand Down Expand Up @@ -59,16 +57,15 @@ import (
_ "github.com/viant/endly/system/cloud/aws/ec2"
_ "github.com/viant/endly/system/cloud/aws/iam"
_ "github.com/viant/endly/system/cloud/aws/kinesis"
_ "github.com/viant/endly/system/cloud/aws/kms"
_ "github.com/viant/endly/system/cloud/aws/lambda"
_ "github.com/viant/endly/system/cloud/aws/logs"
_ "github.com/viant/endly/system/cloud/aws/s3"
_ "github.com/viant/endly/system/cloud/aws/ses"
_ "github.com/viant/endly/system/cloud/aws/sns"
_ "github.com/viant/endly/system/cloud/aws/sqs"
_ "github.com/viant/endly/system/cloud/aws/kms"
_ "github.com/viant/endly/system/cloud/aws/ssm"


_ "github.com/viant/endly/system/cloud/gcp/bigquery"
_ "github.com/viant/endly/system/cloud/gcp/cloudfunctions"
_ "github.com/viant/endly/system/cloud/gcp/compute"
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine/final/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV NOTVISIBLE "in users profile"
ENV GO111MODULE=on


RUN apk add --no-cache curl py-pip bash bash-completion make gcc unixodbc zip git openssh-server
RUN apk add --no-cache curl py-pip bash bash-completion make gcc zip git openssh-server
RUN pip install --no-cache-dir docker-compose
RUN echo 'root:dev' | chpasswd && \
sed -i s/#PermitRootLogin.*/PermitRootLogin\ yes/ /etc/ssh/sshd_config && \
Expand Down
2 changes: 1 addition & 1 deletion docker/alpine/tansient/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM golang:1.12.1-alpine3.9
ENV NOTVISIBLE "in users profile"
ENV GO111MODULE=on

RUN apk add --no-cache curl py-pip jq make gcc unixodbc-dev musl-dev git docker bash openssh-server sudo && \
RUN apk add --no-cache curl py-pip jq make gcc musl-dev git docker bash openssh-server sudo && \
pip install --no-cache-dir docker-compose

RUN echo 'root:dev' | chpasswd && \
Expand Down
8 changes: 4 additions & 4 deletions example/etl/transformer/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/aerospike/aerospike-client-go v1.39.0 h1:4TBtyTU3qcJfhuVPDAkwjX7/x2D+aR6NDQPXBAPjuWI=
github.com/aerospike/aerospike-client-go v1.39.0/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc=
github.com/aerospike/aerospike-client-go v2.0.0+incompatible h1:j6xV1MfL9f5t9BLO1XjcaSCYI1EmBg1isMXabGQxHoE=
github.com/aerospike/aerospike-client-go v2.0.0+incompatible/go.mod h1:zj8LBEnWBDOVEIJt8LvaRvDG5ARAoa5dBeHaB472NRc=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
Expand Down Expand Up @@ -33,8 +33,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/viant/asc v0.2.0 h1:BqnhSMxEIcc25W9vC+pQIu80vIQmEHkD8sgaJsG2cbw=
github.com/viant/asc v0.2.0/go.mod h1:pjK/sKx43GAsDEqdXmvLu2yThFBhg0GTNKSW4YQ/uZs=
github.com/viant/asc v0.4.0 h1:10tyg0ZylB0dxmlq+mhciZ7UdReUZtExHYj6otfX32M=
github.com/viant/asc v0.4.0/go.mod h1:pjK/sKx43GAsDEqdXmvLu2yThFBhg0GTNKSW4YQ/uZs=
github.com/viant/assertly v0.4.4 h1:tNojeh6xblUmwoh301M5UfsZqZ52sL72Dxv5AmHUfP4=
github.com/viant/assertly v0.4.4/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
github.com/viant/dsc v0.6.1 h1:xXTWwXOq+XOD0qgfgnc+LUDTXbKNM3e0xnNF16dsVjQ=
Expand Down
20 changes: 10 additions & 10 deletions shared/static/meta.go

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions shared/static/req.go

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions shared/static/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
)

func init() {
var memStorage = storage.NewMemoryService();
var memStorage = storage.NewMemoryService()
{
err := memStorage.Upload("mem://github.com/viant/endly/Version", bytes.NewReader([]byte{48,46,51,52,46,49}))
err := memStorage.Upload("mem://github.com/viant/endly/Version", bytes.NewReader([]byte{48, 46, 51, 52, 46, 50}))
if err != nil {
log.Printf("failed to upload: mem://github.com/viant/endly/Version %v", err)
}
Expand Down
258 changes: 129 additions & 129 deletions shared/static/workflow.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system/cloud/aws/lambda/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ func (s *service) registerRoutes() {
Handler: func(context *endly.Context, request interface{}) (interface{}, error) {
if req, ok := request.(*CallInput); ok {
response, err := s.call(context, req)
if err == nil{
if err == nil {
context.Publish(aws.NewOutputEvent("call", "lambda", response))
}
return response, err
Expand Down
11 changes: 4 additions & 7 deletions system/cloud/gcp/bigquery/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,24 @@ func Test_Meta(t *testing.T) {
context := endly.New().NewContext(nil)
assert.NotNil(t, context)


parent := toolbox.CallerDirectory(3)

resource := url.NewResource(path.Join(parent, "mv.yaml"))

rawRequest := map[string]interface{}{}


resource.Decode(&rawRequest)

if normalized, err := toolbox.NormalizeKVPairs(rawRequest);err == nil{
rawRequest = toolbox.AsMap(normalized)
if normalized, err := toolbox.NormalizeKVPairs(rawRequest); err == nil {
rawRequest = toolbox.AsMap(normalized)
}

request, err := context.NewRequest(ServiceID, "tablesInsert",rawRequest)
request, err := context.NewRequest(ServiceID, "tablesInsert", rawRequest)
assert.Nil(t, err)

fmt.Printf("%T\n", request)
err =endly.Run(context, request, nil)
err = endly.Run(context, request, nil)

assert.Nil(t, err)


}
26 changes: 10 additions & 16 deletions system/cloud/gcp/cloudfunctions/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (s *service) Deploy(context *endly.Context, request *DeployRequest) (*Deplo
context.Publish(gcp.NewOutputEvent(request.Name, "deploy", response))
return nil, fmt.Errorf("failed to deploy funciton")
}
if len(request.Members) > 0 {
if len(request.Members) > 0 {
err = s.updateInvokers(context, response.Function.Name, request.Members...)
}
return response, err
Expand Down Expand Up @@ -196,14 +196,10 @@ func (s *service) deploy(context *endly.Context, request *DeployRequest) (*cloud
return updateCall.Do()
}





func (s *service) updateInvokers(context *endly.Context, resource string, members ...string) (error) {
func (s *service) updateInvokers(context *endly.Context, resource string, members ...string) error {
ctxClient, err := GetClient(context)
if err != nil {
return err
return err
}
projectService := cloudfunctions.NewProjectsLocationsFunctionsService(ctxClient.service)
call := projectService.GetIamPolicy(resource)
Expand All @@ -217,30 +213,28 @@ func (s *service) updateInvokers(context *endly.Context, resource string, member
policy.Bindings = make([]*cloudfunctions.Binding, 0)
}
updated := false
for _, binding := range policy.Bindings {
for _, binding := range policy.Bindings {
if binding.Role == functionInvokerRole {
binding.Members = members
updated =true
break;
updated = true
break
}
}
if ! updated {
if !updated {
policy.Bindings = append(policy.Bindings, &cloudfunctions.Binding{
Members:members,
Role:functionInvokerRole,
Members: members,
Role: functionInvokerRole,
})
}
policyRequest := &cloudfunctions.SetIamPolicyRequest{
Policy:policy,
Policy: policy,
}
updatePolicyCall := projectService.SetIamPolicy(resource, policyRequest)
updatePolicyCall.Context(ctxClient.Context())
_, err = updatePolicyCall.Do()
return err
}



func (s *service) list(context *endly.Context, request *ListRequest) (*ListResponse, error) {
ctxClient, err := GetClient(context)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions system/docker/contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func (r *RunRequest) Init() error {
}
if r.Port != "" {
portSet := nat.PortSet{nat.Port(r.Port): struct{}{}}
if err := toolbox.DefaultConverter.AssignConverted(&r.Config.ExposedPorts, portSet);err != nil {
if err := toolbox.DefaultConverter.AssignConverted(&r.Config.ExposedPorts, portSet); err != nil {
return err
}
}
Expand All @@ -221,9 +221,9 @@ func (r *RunRequest) Init() error {
if !strings.Contains(dest, "/") {
dest += "/tcp"
}
portsBindings[nat.Port(dest)] = []nat.PortBinding{{HostIP: "0.0.0.0", HostPort: string(source)}}
portsBindings[nat.Port(dest)] = []nat.PortBinding{{HostIP: "0.0.0.0", HostPort: string(source)}}
}
if err := toolbox.DefaultConverter.AssignConverted(&r.HostConfig.PortBindings, portsBindings);err != nil {
if err := toolbox.DefaultConverter.AssignConverted(&r.HostConfig.PortBindings, portsBindings); err != nil {
return err
}

Expand Down
Loading

0 comments on commit 93719dd

Please sign in to comment.