-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…xpires-in Remove default value for `artifactory_scoped_token.expires_in`
- Loading branch information
Showing
4 changed files
with
66 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,6 +91,64 @@ func TestAccScopedToken_UpgradeGH_792(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| func TestAccScopedToken_UpgradeGH_818(t *testing.T) { | ||
| _, fqrn, name := testutil.MkNames("test-scope-token", "artifactory_scoped_token") | ||
| config := utilsdk.ExecuteTemplate( | ||
| "TestAccScopedToken", | ||
| `resource "artifactory_user" "test-user" { | ||
| name = "testuser" | ||
| email = "[email protected]" | ||
| admin = true | ||
| disable_ui_access = false | ||
| groups = ["readers"] | ||
| password = "Passw0rd!" | ||
| } | ||
| resource "artifactory_scoped_token" "{{ .name }}" { | ||
| scopes = ["applied-permissions/user"] | ||
| username = artifactory_user.test-user.name | ||
| }`, | ||
| map[string]interface{}{ | ||
| "name": name, | ||
| }, | ||
| ) | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| ExternalProviders: map[string]resource.ExternalProvider{ | ||
| "artifactory": { | ||
| VersionConstraint: "7.2.0", | ||
| Source: "registry.terraform.io/jfrog/artifactory", | ||
| }, | ||
| }, | ||
| Config: config, | ||
| Check: resource.ComposeTestCheckFunc( | ||
| resource.TestCheckResourceAttr(fqrn, "username", "testuser"), | ||
| resource.TestCheckResourceAttr(fqrn, "scopes.#", "1"), | ||
| resource.TestCheckResourceAttr(fqrn, "expires_in", "31536000"), | ||
| resource.TestCheckNoResourceAttr(fqrn, "audiences"), | ||
| resource.TestCheckResourceAttrSet(fqrn, "access_token"), | ||
| resource.TestCheckNoResourceAttr(fqrn, "refresh_token"), | ||
| resource.TestCheckNoResourceAttr(fqrn, "reference_token"), | ||
| resource.TestCheckResourceAttr(fqrn, "token_type", "Bearer"), | ||
| resource.TestCheckResourceAttrSet(fqrn, "subject"), | ||
| resource.TestCheckResourceAttrSet(fqrn, "expiry"), | ||
| resource.TestCheckResourceAttrSet(fqrn, "issued_at"), | ||
| resource.TestCheckResourceAttrSet(fqrn, "issuer"), | ||
| ), | ||
| ConfigPlanChecks: acctest.ConfigPlanChecks, | ||
| }, | ||
| { | ||
| ProtoV5ProviderFactories: acctest.ProtoV5MuxProviderFactories, | ||
| Config: config, | ||
| PlanOnly: true, | ||
| ConfigPlanChecks: acctest.ConfigPlanChecks, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func scopedTokenUpgradeTestCase(version string, t *testing.T) (*testing.T, resource.TestCase) { | ||
| _, fqrn, name := testutil.MkNames("test-access-token", "artifactory_scoped_token") | ||
|
|
||
|
|
@@ -246,7 +304,7 @@ func TestAccScopedToken_WithAttributes(t *testing.T) { | |
| scopes = ["applied-permissions/admin", "system:metrics:r"] | ||
| description = "test description" | ||
| refreshable = true | ||
| expires_in = 31536000 | ||
| expires_in = 0 | ||
| audiences = ["jfrt@1", "jfxr@*"] | ||
| }`, | ||
| map[string]interface{}{ | ||
|
|
@@ -275,7 +333,7 @@ func TestAccScopedToken_WithAttributes(t *testing.T) { | |
| resource.TestCheckTypeSetElemAttr(fqrn, "scopes.*", "applied-permissions/admin"), | ||
| resource.TestCheckTypeSetElemAttr(fqrn, "scopes.*", "system:metrics:r"), | ||
| resource.TestCheckResourceAttr(fqrn, "refreshable", "true"), | ||
| resource.TestCheckResourceAttr(fqrn, "expires_in", "31536000"), | ||
| resource.TestCheckResourceAttr(fqrn, "expires_in", "0"), | ||
| resource.TestCheckResourceAttr(fqrn, "description", "test description"), | ||
| resource.TestCheckResourceAttr(fqrn, "audiences.#", "2"), | ||
| resource.TestCheckTypeSetElemAttr(fqrn, "audiences.*", "jfrt@1"), | ||
|
|
||