Skip to content

Commit

Permalink
fix: updated api for deleting secrets so "influx secret delete" comma…
Browse files Browse the repository at this point in the history
…nd works again (#469)

* fix: updated api for deleting secrets

* fix: reversed code comments update
  • Loading branch information
FernandoBenayas committed Jan 9, 2023
1 parent ae62da0 commit 4ce9053
Show file tree
Hide file tree
Showing 5 changed files with 231 additions and 12 deletions.
175 changes: 175 additions & 0 deletions api/api_secrets.gen.go

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

2 changes: 2 additions & 0 deletions api/contract/cli.yml
Expand Up @@ -43,6 +43,8 @@ paths:
$ref: "./openapi/src/common/paths/orgs_orgID_secrets.yml"
/api/v2/orgs/{orgID}/secrets/{delete}:
$ref: "./openapi/src/common/paths/orgs_orgID_secrets_delete.yml"
/api/v2/orgs/{orgID}/secrets/{secretID}:
$ref: "./openapi/src/common/paths/orgs_orgID_secrets_secretID.yml"
/api/v2/buckets/{bucketID}/schema/measurements:
$ref: "./openapi/src/cloud/paths/measurements.yml"
/api/v2/buckets/{bucketID}/schema/measurements/{measurementID}:
Expand Down
7 changes: 3 additions & 4 deletions clients/secret/secret.go
Expand Up @@ -36,11 +36,10 @@ func (c Client) Delete(ctx context.Context, params *DeleteParams) error {
return err
}

// PostOrgsIDSecrets is used to remove secrets from an organization.
// DeleteOrgsIDSecretsID is used to remove a secret from an organization.
// The name is generated from the operationId in the
// orgs_orgsID_secrets_delete.yml path.
err = c.PostOrgsIDSecrets(ctx, orgID).
SecretKeys(api.SecretKeys{Secrets: &[]string{params.Key}}).
// orgs_orgsID_secrets_secretID.yml path.
err = c.DeleteOrgsIDSecretsID(ctx, orgID, params.Key).
Execute()
if err != nil {
return fmt.Errorf("failed to delete secret with key %q: %w", params.Key, err)
Expand Down
16 changes: 8 additions & 8 deletions clients/secret/secret_test.go
Expand Up @@ -140,11 +140,11 @@ func TestSecret_Delete(t *testing.T) {
},
defaultOrgName: defaultOrgName,
registerExpectations: func(t *testing.T, secretApi *mock.MockSecretsApi) {
req := api.ApiPostOrgsIDSecretsRequest{ApiService: secretApi}.
req := api.ApiDeleteOrgsIDSecretsIDRequest{ApiService: secretApi}.
OrgID(id).
SecretKeys(api.SecretKeys{Secrets: &[]string{"key1"}})
secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id)).Return(req)
secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
SecretID("key1")
secretApi.EXPECT().DeleteOrgsIDSecretsID(gomock.Any(), gomock.Eq(id), gomock.Eq("key1")).Return(req)
secretApi.EXPECT().DeleteOrgsIDSecretsIDExecute(gomock.Eq(req)).Return(nil)
},
expectMatcher: printHeader + fakeKey + "\t" + id + "\ttrue\n",
},
Expand All @@ -159,11 +159,11 @@ func TestSecret_Delete(t *testing.T) {
},
defaultOrgName: defaultOrgName,
registerExpectations: func(t *testing.T, secretApi *mock.MockSecretsApi) {
req := api.ApiPostOrgsIDSecretsRequest{ApiService: secretApi}.
req := api.ApiDeleteOrgsIDSecretsIDRequest{ApiService: secretApi}.
OrgID(id).
SecretKeys(api.SecretKeys{Secrets: &[]string{""}})
secretApi.EXPECT().PostOrgsIDSecrets(gomock.Any(), gomock.Eq(id)).Return(req)
secretApi.EXPECT().PostOrgsIDSecretsExecute(gomock.Eq(req)).Return(nil)
SecretID("")
secretApi.EXPECT().DeleteOrgsIDSecretsID(gomock.Any(), gomock.Eq(id), gomock.Eq("")).Return(req)
secretApi.EXPECT().DeleteOrgsIDSecretsIDExecute(gomock.Eq(req)).Return(nil)
},
expectMatcher: printHeader + "\t" + id + "\ttrue\n",
},
Expand Down
43 changes: 43 additions & 0 deletions internal/mock/api_secret.gen.go

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

0 comments on commit 4ce9053

Please sign in to comment.