improve

1Password · May 29, 2023 · 9689e72 · 9689e72
1 parent 5a91457
commit 9689e72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/plugins/vercel/api_token.go b/plugins/vercel/api_token.go
@@ -13,7 +13,7 @@ import (
 func APIToken() schema.CredentialType {
 	return schema.CredentialType{
 		Name:          credname.APIToken,
-		DocsURL:       sdk.URL("https://vercel.com/docs/cli/login"),
+		DocsURL:       sdk.URL("https://vercel.com/docs/rest-api"),
 		ManagementURL: sdk.URL("https://vercel.com/account/tokens"),
 		Fields: []schema.CredentialField{
 			{
@@ -32,11 +32,6 @@ func APIToken() schema.CredentialType {
 		},
 		DefaultProvisioner: vercelProvisioner{},
 		Importer: importer.TryAll(
-			importer.TryEnvVarPair(
-				map[string]sdk.FieldName{
-					"VERCEL_TOKEN": fieldname.Token,
-				},
-			),
 			importer.MacOnly(TryVercelConfigFile("~/Library/Application Support/com.vercel.cli/auth.json")),
 			importer.LinuxOnly(TryVercelConfigFile("~/.config/com.vercel.cli/auth.json")),
 		),

diff --git a/plugins/vercel/api_token_test.go b/plugins/vercel/api_token_test.go
@@ -26,9 +26,10 @@ func TestAPITokenProvisioner(t *testing.T) {
 func TestAPITokenImporter(t *testing.T) {
 	plugintest.TestImporter(
 		t, APIToken().Importer, map[string]plugintest.ImportCase{
-			"environment": {
-				Environment: map[string]string{
-					"VERCEL_TOKEN": "tZk79pLyPLGgUVlkHbnLeXgl",
+			"config file (macOS)": {
+				OS: "darwin",
+				Files: map[string]string{
+					"~/Library/Application Support/com.vercel.cli/auth.json": plugintest.LoadFixture(t, "auth.json"),
 				},
 				ExpectedCandidates: []sdk.ImportCandidate{
 					{
@@ -38,10 +39,10 @@ func TestAPITokenImporter(t *testing.T) {
 					},
 				},
 			},
-			"config file": {
+			"config file (Linux)": {
 				OS: "darwin",
 				Files: map[string]string{
-					"~/Library/Application Support/com.vercel.cli/auth.json": plugintest.LoadFixture(t, "auth.json"),
+					"~/.config/com.vercel.cli/auth.json": plugintest.LoadFixture(t, "auth.json"),
 				},
 				ExpectedCandidates: []sdk.ImportCandidate{
 					{

diff --git a/plugins/vercel/vercel.go b/plugins/vercel/vercel.go
@@ -15,6 +15,7 @@ func VercelCLI() schema.Executable {
 		NeedsAuth: needsauth.IfAll(
 			needsauth.NotForHelpOrVersion(),
 			needsauth.NotWithoutArgs(),
+			needsauth.NotWhenContainsArgs("login"),
 		),
 		Uses: []schema.CredentialUsage{
 			{