apikey files updated

1Password · Jun 29, 2023 · 65c0d65 · 65c0d65
1 parent 37ecffe
commit 65c0d65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/plugins/civo/api_key.go b/plugins/civo/api_key.go
@@ -30,28 +30,16 @@ func APIKey() schema.CredentialType {
 					},
 				},
 			},
-			{
-				Name:                fieldname.APIKeyID,
-				MarkdownDescription: "The Name of apikey used to authenticate to civo",
-				Optional:            true,
-			},
 		},
 		DefaultProvisioner: provision.EnvVars(defaultEnvVarMapping),
 		Importer: importer.TryAll(
 			importer.TryEnvVarPair(defaultEnvVarMapping),
-			importer.TryEnvVarPair(secondEnvVarMapping),
 			TryCivoConfigFile("~/.civo.json"),
 		)}
 }
 
 var defaultEnvVarMapping = map[string]sdk.FieldName{
-	"CIVO_TOKEN":        fieldname.APIKey,
-	//"CIVO_API_KEY_NAME": fieldname.APIKeyID,
-}
-
-var secondEnvVarMapping = map[string]sdk.FieldName{
-    "CIVO_API_KEY"     : fieldname.APIKey,
-    "CIVO_API_KEY_NAME": fieldname.APIKeyID,
+	"CIVO_TOKEN": fieldname.APIKey,
 }
 
 func TryCivoConfigFile(path string) sdk.Importer {

diff --git a/plugins/civo/api_key_test.go b/plugins/civo/api_key_test.go
@@ -12,11 +12,11 @@ func TestAPIKeyProvisioner(t *testing.T) {
 	plugintest.TestProvisioner(t, APIKey().DefaultProvisioner, map[string]plugintest.ProvisionCase{
 		"default": {
 			ItemFields: map[sdk.FieldName]string{
-				fieldname.APIKey:   "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
+				fieldname.APIKey: "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
 			},
 			ExpectedOutput: sdk.ProvisionOutput{
 				Environment: map[string]string{
-					"CIVO_TOKEN":        "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
+					"CIVO_TOKEN": "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
 				},
 			},
 		},
@@ -27,15 +27,12 @@ func TestAPIKeyImporter(t *testing.T) {
 	plugintest.TestImporter(t, APIKey().Importer, map[string]plugintest.ImportCase{
 		"environment": {
 			Environment: map[string]string{
-				"CIVO_TOKEN":        "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
-				"CIVO_API_KEY":      "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
-				"CIVO_API_KEY_NAME": "testdemoname",
+				"CIVO_TOKEN": "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
 			},
 			ExpectedCandidates: []sdk.ImportCandidate{
 				{
 					Fields: map[sdk.FieldName]string{
-						fieldname.APIKey:   "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
-						fieldname.APIKeyID: "testdemoname",
+						fieldname.APIKey: "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
 					},
 				},
 			},
@@ -47,12 +44,11 @@ func TestAPIKeyImporter(t *testing.T) {
 				"~/.civo.json": plugintest.LoadFixture(t, ".civo.json"),
 			},
 			ExpectedCandidates: []sdk.ImportCandidate{
-
 				{
 					Fields: map[sdk.FieldName]string{
-						fieldname.APIKey:        "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
-						fieldname.APIKeyID:      "testdemoname",
+						fieldname.APIKey: "XFIx85McyfCQc490j1tBa5b5s2XiWerNdOdfnkrOnchEXAMPLE",
 					},
+					NameHint:"testdemoname",
 				},
 			},
 		},