Skip to content

Commit

Permalink
chore: separate cloud specific logic into their own pkgs (#300)
Browse files Browse the repository at this point in the history
  • Loading branch information
goncalo-rodrigues authored Jun 9, 2022
1 parent ab3113b commit acba233
Show file tree
Hide file tree
Showing 75 changed files with 4,595 additions and 5,178 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,8 @@ jobs:
go vet .
golint .
# https://github.com/aws/aws-cli/issues/6920 there's a bug with v1.24
- uses: azure/[email protected]
with:
version: 'v1.23.6'
id: install

- id: install-aws-cli
uses: unfor19/[email protected]
with:
version: 2.7.6
arch: amd64

- name: Test
run: go test ./test/e2e -v -tags=e2e -timeout=180m -parallel 4
run: go test ./test/e2e -tags=e2e -timeout=180m -parallel 4
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_E2E }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_E2E }}
Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "e2e-pr"
on:
pull_request:
branches: [ main ]
types: [ labeled, unlabeled ]
types: [ labeled, unlabeled, opened, synchronize, reopened]

jobs:
test:
Expand Down Expand Up @@ -46,21 +46,8 @@ jobs:
go vet .
golint .
# https://github.com/aws/aws-cli/issues/6920 there's a bug with v1.24
# https://github.com/aws/aws-cli/issues/6920 there's a bug with v1.24
- uses: azure/[email protected]
with:
version: 'v1.23.6'
id: install

- id: install-aws-cli
uses: unfor19/[email protected]
with:
version: 2.7.6
arch: amd64

- name: Test
run: go test ./test/e2e -v -tags=e2e -timeout=180m -parallel 4
run: go test ./test/e2e -tags=e2e -timeout=180m -parallel 4
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_E2E }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_E2E }}
Expand Down
4 changes: 2 additions & 2 deletions api/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/multycloud/multy/flags"
"github.com/multycloud/multy/resources"
"github.com/multycloud/multy/resources/output"
"github.com/multycloud/multy/resources/types"
"github.com/multycloud/multy/resources/types/metadata"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"log"
Expand Down Expand Up @@ -63,7 +63,7 @@ func (d DeploymentExecutor) Deploy(ctx context.Context, c *resources.MultyConfig
// rollback if something goes wrong
if err != nil {
log.Println("[ERROR] Something went wrong, rolling back")
originalC, err2 := c.GetOriginalConfig(types.Metadatas)
originalC, err2 := c.GetOriginalConfig(metadata.Metadatas)
if err2 != nil {
log.Printf("[ERROR] Rollback unsuccessful: %s\n", err2)
return
Expand Down
4 changes: 4 additions & 0 deletions api/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ func ValidationErrors(errs []validate.ValidationError) error {
return st.Err()
}

func ValidationError(err validate.ValidationError) error {
return ValidationErrors([]validate.ValidationError{err})
}

func ResourceNotFound(resourceId string) error {
st := status.New(codes.NotFound, fmt.Sprintf("resource with id %s not found", resourceId))
st, _ = st.WithDetails(&pberr.ResourceNotFoundDetails{ResourceId: resourceId})
Expand Down
1,340 changes: 651 additions & 689 deletions api/proto/multy_service.pb.go

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions api/proto/multy_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import "api/proto/resourcespb/vault.proto";
import "api/proto/resourcespb/vault_access_policy.proto";
import "api/proto/resourcespb/vault_secret.proto";
import "api/proto/resourcespb/public_ip.proto";
import "api/proto/resourcespb/lambda.proto";
import "api/proto/resourcespb/kubernetes_cluster.proto";
import "api/proto/resourcespb/kubernetes_node_pool.proto";
import "api/proto/resourcespb/object_storage.proto";
Expand Down Expand Up @@ -94,11 +93,6 @@ service MultyResourceService {
rpc UpdateKubernetesNodePool (resources.UpdateKubernetesNodePoolRequest) returns (resources.KubernetesNodePoolResource) {}
rpc DeleteKubernetesNodePool (resources.DeleteKubernetesNodePoolRequest) returns (common.Empty) {}

rpc CreateLambda (resources.CreateLambdaRequest) returns (resources.LambdaResource) {}
rpc ReadLambda (resources.ReadLambdaRequest) returns (resources.LambdaResource) {}
rpc UpdateLambda (resources.UpdateLambdaRequest) returns (resources.LambdaResource) {}
rpc DeleteLambda (resources.DeleteLambdaRequest) returns (common.Empty) {}

rpc CreateVault (resources.CreateVaultRequest) returns (resources.VaultResource) {}
rpc ReadVault (resources.ReadVaultRequest) returns (resources.VaultResource) {}
rpc UpdateVault (resources.UpdateVaultRequest) returns (resources.VaultResource) {}
Expand Down
144 changes: 0 additions & 144 deletions api/proto/multy_service_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit acba233

Please sign in to comment.