Organization ID and Deployment configuration

Author: rajapri28613

plugins/axiom/personal_access_token.go

@@ -28,12 +28,38 @@ func PersonalAccessToken() schema.CredentialType {
 					},
 				},
 			},
+			{
+				Name:                fieldname.Organization,
+				MarkdownDescription: "The organization ID of the organization the access token is valid for. Only valid for Axiom Cloud.",
+				Secret:              false,
+				Composition: &schema.ValueComposition{
+					Charset: schema.Charset{
+						Lowercase: true,
+						Digits:    true,
+						Specific:  []rune{'-'},
+					},
+				},
+			},
+			{
+				Name:                fieldname.Deployment,
+				MarkdownDescription: "Deployment to use.",
+				Secret:              false,
+				Optional:            true,
+				Composition: &schema.ValueComposition{
+					Charset: schema.Charset{
+						Lowercase: true,
+						Digits:    true,
+					},
+				},
+			},
 		},
 		DefaultProvisioner: provision.EnvVars(defaultEnvVarMapping),
 		Importer:           importer.TryEnvVarPair(defaultEnvVarMapping),
 	}
 }
 
 var defaultEnvVarMapping = map[string]sdk.FieldName{
-	"AXIOM_TOKEN": fieldname.Token,
+	"AXIOM_TOKEN":      fieldname.Token,
+	"AXIOM_ORG_ID":     fieldname.Organization,
+	"AXIOM_DEPLOYMENT": fieldname.Deployment,
 }

plugins/axiom/personal_access_token_test.go

@@ -12,11 +12,15 @@ func TestPersonalAccessTokenProvisioner(t *testing.T) {
 	plugintest.TestProvisioner(t, PersonalAccessToken().DefaultProvisioner, map[string]plugintest.ProvisionCase{
 		"default": {
 			ItemFields: map[sdk.FieldName]string{
-				fieldname.Token: "xapt-wovexreez0qf7zvkn935na41cudk2example",
+				fieldname.Token:        "xapt-wovexreez0qf7zvkn935na41cudk2example",
+				fieldname.Organization: "example",
+				fieldname.Deployment:   "cloud",
 			},
 			ExpectedOutput: sdk.ProvisionOutput{
 				Environment: map[string]string{
-					"AXIOM_TOKEN": "xapt-wovexreez0qf7zvkn935na41cudk2example",
+					"AXIOM_TOKEN":      "xapt-wovexreez0qf7zvkn935na41cudk2example",
+					"AXIOM_ORG_ID":     "example",
+					"AXIOM_DEPLOYMENT": "cloud",
 				},
 			},
 		},
@@ -27,12 +31,16 @@ func TestPersonalAccessTokenImporter(t *testing.T) {
 	plugintest.TestImporter(t, PersonalAccessToken().Importer, map[string]plugintest.ImportCase{
 		"environment": {
 			Environment: map[string]string{
-				"AXIOM_TOKEN": "xapt-wovexreez0qf7zvkn935na41cudk2example",
+				"AXIOM_TOKEN":      "xapt-wovexreez0qf7zvkn935na41cudk2example",
+				"AXIOM_ORG_ID":     "example",
+				"AXIOM_DEPLOYMENT": "cloud",
 			},
 			ExpectedCandidates: []sdk.ImportCandidate{
 				{
 					Fields: map[sdk.FieldName]string{
-						fieldname.Token: "xapt-wovexreez0qf7zvkn935na41cudk2example",
+						fieldname.Token:        "xapt-wovexreez0qf7zvkn935na41cudk2example",
+						fieldname.Organization: "example",
+						fieldname.Deployment:   "cloud",
 					},
 				},
 			},

sdk/schema/fieldname/names.go

@@ -27,6 +27,7 @@ const (
 	Credentials     = sdk.FieldName("Credentials")
 	Database        = sdk.FieldName("Database")
 	DefaultRegion   = sdk.FieldName("Default Region")
+	Deployment      = sdk.FieldName("Deployment")
 	Email           = sdk.FieldName("Email")
 	Endpoint        = sdk.FieldName("Endpoint")
 	Host            = sdk.FieldName("Host")
@@ -78,6 +79,7 @@ func ListAll() []sdk.FieldName {
 		Credentials,
 		Database,
 		DefaultRegion,
+		Deployment,
 		Endpoint,
 		Host,
 		HostAddress,