From 6a9e7abe114297e079777feaf6dc2e3f4e261899 Mon Sep 17 00:00:00 2001 From: Arun Date: Wed, 14 Jun 2023 23:54:44 -0400 Subject: [PATCH 1/2] Move temp file provisioner for Akamai to the executable-level and set default provisioner to nil --- plugins/akamai/akamai.go | 9 +++++++++ plugins/akamai/api_client_credentials.go | 10 +--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/akamai/akamai.go b/plugins/akamai/akamai.go index 9d88df35c..5ad48f128 100644 --- a/plugins/akamai/akamai.go +++ b/plugins/akamai/akamai.go @@ -3,6 +3,7 @@ package akamai import ( "github.com/1Password/shell-plugins/sdk" "github.com/1Password/shell-plugins/sdk/needsauth" + "github.com/1Password/shell-plugins/sdk/provision" "github.com/1Password/shell-plugins/sdk/schema" "github.com/1Password/shell-plugins/sdk/schema/credname" ) @@ -27,6 +28,14 @@ func AkamaiCLI() schema.Executable { Uses: []schema.CredentialUsage{ { Name: credname.APIClientCredentials, + Provisioner: provision.TempFile(configFile, + provision.Filename(".edgerc"), + provision.AddArgs( + "--edgerc", "{{ .Path }}", + "--section", "default", + ), + provision.SetPathAsEnvVar("EDGERC"), // for Akamai Terraform provider + ), }, }, } diff --git a/plugins/akamai/api_client_credentials.go b/plugins/akamai/api_client_credentials.go index 87fda0dbf..4d54e7758 100644 --- a/plugins/akamai/api_client_credentials.go +++ b/plugins/akamai/api_client_credentials.go @@ -5,7 +5,6 @@ import ( "github.com/1Password/shell-plugins/sdk" "github.com/1Password/shell-plugins/sdk/importer" - "github.com/1Password/shell-plugins/sdk/provision" "github.com/1Password/shell-plugins/sdk/schema" "github.com/1Password/shell-plugins/sdk/schema/credname" "github.com/1Password/shell-plugins/sdk/schema/fieldname" @@ -71,14 +70,7 @@ func APIClientCredentials() schema.CredentialType { }, }, }, - DefaultProvisioner: provision.TempFile(configFile, - provision.Filename(".edgerc"), - provision.AddArgs( - "--edgerc", "{{ .Path }}", - "--section", "default", - ), - provision.SetPathAsEnvVar("EDGERC"), // for Akamai Terraform provider - ), + DefaultProvisioner: nil, Importer: importer.TryAll( TryAkamaiConfigFile(), )} From 532ecff9d0d6cc649cfa9635a179082ee9905fab Mon Sep 17 00:00:00 2001 From: Arun Date: Thu, 15 Jun 2023 00:03:46 -0400 Subject: [PATCH 2/2] Update Akamai provisioner test to reference the provisioner at the executable-level --- plugins/akamai/api_client_credentials_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/akamai/api_client_credentials_test.go b/plugins/akamai/api_client_credentials_test.go index 3ec4bc893..b9d467b1a 100644 --- a/plugins/akamai/api_client_credentials_test.go +++ b/plugins/akamai/api_client_credentials_test.go @@ -9,7 +9,7 @@ import ( ) func TestAPIClientCredentialsProvisioner(t *testing.T) { - plugintest.TestProvisioner(t, APIClientCredentials().DefaultProvisioner, map[string]plugintest.ProvisionCase{ + plugintest.TestProvisioner(t, AkamaiCLI().Uses[0].Provisioner, map[string]plugintest.ProvisionCase{ "default": { ItemFields: map[sdk.FieldName]string{ fieldname.ClientSecret: "abcdE23FNkBxy456z25qx9Yp5CPUxlEfQeTDkfh4QA=I",