suggested changes added

1Password · Jun 29, 2023 · d43d078 · d43d078
1 parent b58afee
commit d43d078
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/plugins/upstash/api_key.go b/plugins/upstash/api_key.go
@@ -26,6 +26,7 @@ func APIKey() schema.CredentialType {
  Charset: schema.Charset{
  Lowercase: true,
  Digits: true,
+ Symbols: true,
  },
  },
  },

diff --git a/plugins/upstash/api_key_test.go b/plugins/upstash/api_key_test.go
@@ -13,12 +13,12 @@ func TestAPIKeyProvisioner(t *testing.T) {
  "default": {
  ItemFields: map[sdk.FieldName]string{
  fieldname.APIKey: "d68850db-69f7-qxe9pubcmjnqfgyexample",
- fieldname.Email: "fakememail12@gmail.com",
+ fieldname.Email: "wendy@appleseed.com",
  },
  ExpectedOutput: sdk.ProvisionOutput{
  Environment: map[string]string{
  "UPSTASH_API_KEY": "d68850db-69f7-qxe9pubcmjnqfgyexample",
- "UPSTASH_EMAIL":  "fakememail12@gmail.com",
+ "UPSTASH_EMAIL": "wendy@appleseed.com",
  },
  },
  },
@@ -30,13 +30,13 @@ func TestAPIKeyImporter(t *testing.T) {
  "environment": {
  Environment: map[string]string{
  "UPSTASH_API_KEY": "d68850db-69f7-qxe9pubcmjnqfgyexample",
- "UPSTASH_EMAIL": "fakememail12@gmail.com",
+ "UPSTASH_EMAIL": "wendy@appleseed.com",
  },
  ExpectedCandidates: []sdk.ImportCandidate{
  {
  Fields: map[sdk.FieldName]string{
  fieldname.APIKey: "d68850db-69f7-qxe9pubcmjnqfgyexample",
- fieldname.Email: "fakememail12@gmail.com",
+ fieldname.Email: "wendy@appleseed.com",
  },
  },
  },
@@ -50,7 +50,7 @@ func TestAPIKeyImporter(t *testing.T) {
  {
  Fields: map[sdk.FieldName]string{
  fieldname.APIKey: "d68850db-69f7-qxe9pubcmjnqfgyexample",
- fieldname.Email: "fakememail12@gmail.com",
+ fieldname.Email: "wendy@appleseed.com",
  },
  },
  },

diff --git a/plugins/upstash/test-fixtures/.upstash.json b/plugins/upstash/test-fixtures/.upstash.json
@@ -1,4 +1,4 @@
 {
  "apiKey":"d68850db-69f7-qxe9pubcmjnqfgyexample",
- "email" : "fakememail12@gmail.com"
+ "email" : "wendy@appleseed.com"
 }
diff --git a/plugins/upstash/upstash.go b/plugins/upstash/upstash.go
@@ -15,7 +15,8 @@ func UpstashCLI() schema.Executable {
  NeedsAuth: needsauth.IfAll(
  needsauth.NotForHelpOrVersion(),
  needsauth.NotWithoutArgs(),
- needsauth.NotForExactArgs("config"),
+ needsauth.NotWhenContainsArgs("--config"),
+ needsauth.NotWhenContainsArgs("-c"),
  needsauth.NotWhenContainsArgs("auth"),
  ),
  Uses: []schema.CredentialUsage{