Revert changes before merge

capactio · Mar 10, 2022 · 048f86f · 048f86f
1 parent 9cd79fc
commit 048f86f
Show file tree

Hide file tree

Showing 8 changed files with 5,494 additions and 5,879 deletions.
diff --git a/hub-js/package-lock.json b/hub-js/package-lock.json
diff --git a/hub-js/proto/storage_backend.proto b/hub-js/proto/storage_backend.proto
@@ -22,7 +22,7 @@ message OnUpdateRequest {
   uint32 new_resource_version = 2;
   bytes new_value = 3;
   optional bytes context = 4;
-	optional string owner_id = 5;
+  optional string owner_id = 5;
 }
 
 message OnUpdateResponse {
@@ -32,7 +32,7 @@ message OnUpdateResponse {
 message OnDeleteRequest {
   string type_instance_id = 1;
   optional bytes context = 2;
-	optional string owner_id = 3;
+  optional string owner_id = 3;
 }
 
 message OnDeleteResponse {}

diff --git a/hub-js/src/local/resolver/field/spec-value-field.ts b/hub-js/src/local/resolver/field/spec-value-field.ts
@@ -87,7 +87,6 @@ async function resolveMutationReturnValue(
     newValue = resp[tiId];
   }
 
-  console.log(context.updateArgs.GetOwnerID(fetchInput.typeInstance.id));
   // 2. Update TypeInstance's value
   const update = {
     backend: fetchInput.backend,

diff --git a/internal/secret-storage-backend/export_test.go b/internal/secret-storage-backend/export_test.go
@@ -2,6 +2,6 @@ package secretstoragebackend
 
 import tellercore "github.com/spectralops/teller/pkg/core"
 
-func (h *Handler) GetProviderFromContext(contextBytes []byte) (tellercore.Provider, []byte, error) {
+func (h *Handler) GetProviderFromContext(contextBytes []byte) (tellercore.Provider, error) {
 	return h.getProviderFromContext(contextBytes)
 }
diff --git a/internal/secret-storage-backend/server.go b/internal/secret-storage-backend/server.go
@@ -15,9 +15,6 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-// TODO(review): ALL CHANGES WILL BE REVERTED BEFORE MERGING. IT WAS CHANGED ONLY FOR DEMO/PR TESTING PURPOSES.
-// TODO(review): Changes related to ownerID will stay.
-
 // Context holds Secret storage backend specific parameters.
 type Context struct {
 	Provider string `json:"provider"`
@@ -84,7 +81,7 @@ func (h *Handler) GetValue(_ context.Context, request *pb.GetValueRequest) (*pb.
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +107,7 @@ func (h *Handler) GetLockedBy(_ context.Context, request *pb.GetLockedByRequest)
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -145,7 +142,7 @@ func (h *Handler) OnCreate(_ context.Context, request *pb.OnCreateRequest) (*pb.
 		return nil, NilRequestInputError
 	}
 
-	provider, updatedCtx, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -160,9 +157,7 @@ func (h *Handler) OnCreate(_ context.Context, request *pb.OnCreateRequest) (*pb.
 		return nil, err
 	}
 
-	return &pb.OnCreateResponse{
-		Context: updatedCtx,
-	}, nil
+	return &pb.OnCreateResponse{}, nil
 }
 
 // OnUpdate handles TypeInstance update by updating secret in a given provider.
@@ -171,7 +166,7 @@ func (h *Handler) OnUpdate(_ context.Context, request *pb.OnUpdateRequest) (*pb.
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -197,7 +192,7 @@ func (h *Handler) OnLock(_ context.Context, request *pb.OnLockRequest) (*pb.OnLo
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -223,7 +218,7 @@ func (h *Handler) OnUnlock(_ context.Context, request *pb.OnUnlockRequest) (*pb.
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -252,7 +247,7 @@ func (h *Handler) OnDelete(_ context.Context, request *pb.OnDeleteRequest) (*pb.
 		return nil, NilRequestInputError
 	}
 
-	provider, _, err := h.getProviderFromContext(request.Context)
+	provider, err := h.getProviderFromContext(request.Context)
 	if err != nil {
 		return nil, err
 	}
@@ -273,32 +268,36 @@ func (h *Handler) OnDelete(_ context.Context, request *pb.OnDeleteRequest) (*pb.
 	return &pb.OnDeleteResponse{}, nil
 }
 
-func (h *Handler) getProviderFromContext(contextBytes []byte) (tellercore.Provider, []byte, error) {
-	def, err := h.providers.GetDefault()
-	if err != nil {
-		return nil, nil, h.failedPreconditionError(errors.Wrap(err, "while getting default provider based on empty context"))
-	}
-
+func (h *Handler) getProviderFromContext(contextBytes []byte) (tellercore.Provider, error) {
 	if len(contextBytes) == 0 {
-		return def, nil, nil
+		provider, err := h.providers.GetDefault()
+		if err != nil {
+			return nil, h.failedPreconditionError(errors.Wrap(err, "while getting default provider based on empty context"))
+		}
+		return provider, nil
 	}
 
-	var ctx Context
-	err = json.Unmarshal(contextBytes, &ctx)
+	var context Context
+	err := json.Unmarshal(contextBytes, &context)
 	if err != nil {
-		return nil, nil, h.internalError(errors.Wrap(err, "while unmarshaling additional parameters"))
+		return nil, h.internalError(errors.Wrap(err, "while unmarshaling context"))
 	}
 
-	if ctx.Provider == "mock-me" {
-		return def, []byte(`{"modified": "by-backend-storage"}`), nil
+	if context.Provider == "" {
+		provider, err := h.providers.GetDefault()
+		if err != nil {
+			return nil, h.failedPreconditionError(errors.Wrap(err, "while getting default provider as not specified in context"))
+		}
+
+		return provider, nil
 	}
 
-	provider, ok := h.providers[ctx.Provider]
+	provider, ok := h.providers[context.Provider]
 	if !ok {
-		return def, nil, nil
+		return nil, h.failedPreconditionError(fmt.Errorf("missing loaded provider with name %q", context.Provider))
 	}
 
-	return provider, nil, nil
+	return provider, nil
 }
 
 func (h *Handler) getEntry(provider tellercore.Provider, key tellercore.KeyPath) (*tellercore.EnvEntry, error) {

diff --git a/internal/secret-storage-backend/server_test.go b/internal/secret-storage-backend/server_test.go
@@ -679,7 +679,7 @@ func TestHandler_GetProviderFromContext(t *testing.T) {
 				"one": &fakeProvider{name: "one"},
 			},
 			InputContextBytes:    []byte(`{foo}`),
-			ExpectedErrorMessage: ptr.String("rpc error: code = Internal desc = while unmarshaling additional parameters: invalid character 'f' looking for beginning of object key string"),
+			ExpectedErrorMessage: ptr.String("rpc error: code = Internal desc = while unmarshaling context: invalid character 'f' looking for beginning of object key string"),
 		},
 		{
 			// this case shouldn't happen as the server validates list of input providers during start
@@ -719,7 +719,7 @@ func TestHandler_GetProviderFromContext(t *testing.T) {
 			handler := secret_storage_backend.NewHandler(logger.Noop(), testCase.InputProviders)
 
 			// when
-			provider, _, err := handler.GetProviderFromContext(testCase.InputContextBytes)
+			provider, err := handler.GetProviderFromContext(testCase.InputContextBytes)
 
 			// then
 			if testCase.ExpectedErrorMessage != nil {

diff --git a/pkg/hub/api/graphql/local/schema_gen.go b/pkg/hub/api/graphql/local/schema_gen.go