forked from microsoft/terraform-provider-azuredevops
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding the JFrog V2 service connections. I just copy+pasted the existing Artifactory resource, tests & docs then adjusted accordingly. They all use the same parameters. One unit test needed fixing, the argocd connection seemed to be based on these so I adopted the same fix that was in that resource. Unit & acceptance tests for the service connections have passed. Docs have been updated. The formatting scripts in the repo want to reformat all sorts of stuff. I'll leave that to Microsoft's discretion when I upstream this.
- Loading branch information
1 parent
1cc80b5
commit 26e30d7
Showing
20 changed files
with
3,235 additions
and
8 deletions.
There are no files selected for viewing
368 changes: 368 additions & 0 deletions
368
azuredevops/internal/acceptancetests/resource_serviceendpoint_jfrog_artifactory_v2_test.go
Large diffs are not rendered by default.
Oops, something went wrong.
368 changes: 368 additions & 0 deletions
368
azuredevops/internal/acceptancetests/resource_serviceendpoint_jfrog_distribution_v2_test.go
Large diffs are not rendered by default.
Oops, something went wrong.
368 changes: 368 additions & 0 deletions
368
azuredevops/internal/acceptancetests/resource_serviceendpoint_jfrog_platform_v2_test.go
Large diffs are not rendered by default.
Oops, something went wrong.
368 changes: 368 additions & 0 deletions
368
azuredevops/internal/acceptancetests/resource_serviceendpoint_jfrog_xray_v2_test.go
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 |
|---|---|---|
| @@ -0,0 +1,368 @@ | ||
| //go:build (all || resource_serviceendpoint_jfrog_xray_v2) && !exclude_serviceendpoints | ||
| // +build all resource_serviceendpoint_jfrog_xray_v2 | ||
| // +build !exclude_serviceendpoints | ||
|
|
||
| package acceptancetests | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
| "github.com/microsoft/terraform-provider-azuredevops/azuredevops/internal/acceptancetests/testutils" | ||
| ) | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_basic(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasic(projectName, serviceEndpointName, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "url"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointName), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_basic_usernamepassword(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasicUsernamePassword(projectName, serviceEndpointName, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "authentication_basic.#", "1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointName), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_complete_token(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
| description := t.Name() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceComplete(projectName, serviceEndpointName, description), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "authentication_token.#", "1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "url", "https://url.com/1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointName), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "description", description), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_complete_usernamepassword(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
| description := t.Name() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceCompleteUsernamePassword(projectName, serviceEndpointName, description), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "authentication_basic.#", "1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "url", "https://url.com/1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointName), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "description", description), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_update(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointNameFirst := testutils.GenerateResourceName() | ||
|
|
||
| description := t.Name() | ||
| serviceEndpointNameSecond := testutils.GenerateResourceName() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasic(projectName, serviceEndpointNameFirst, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointNameFirst), resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointNameFirst), | ||
| ), | ||
| }, | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceUpdate(projectName, serviceEndpointNameSecond, description), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointNameSecond), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "authentication_token.#", "1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "url", "https://url.com/2"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointNameSecond), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "description", description), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_update_usernamepassword(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointNameFirst := testutils.GenerateResourceName() | ||
|
|
||
| description := t.Name() | ||
| serviceEndpointNameSecond := testutils.GenerateResourceName() | ||
|
|
||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasicUsernamePassword(projectName, serviceEndpointNameFirst, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointNameFirst), resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointNameFirst), | ||
| ), | ||
| }, | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceUpdateUsernamePassword(projectName, serviceEndpointNameSecond, description), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointNameSecond), | ||
| resource.TestCheckResourceAttrSet(tfSvcEpNode, "project_id"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "authentication_basic.#", "1"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "url", "https://url.com/2"), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "service_endpoint_name", serviceEndpointNameSecond), | ||
| resource.TestCheckResourceAttr(tfSvcEpNode, "description", description), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_RequiresImportErrorStep(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
|
|
||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasic(projectName, serviceEndpointName, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| ), | ||
| }, | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceRequiresImport(projectName, serviceEndpointName, t.Name()), | ||
| ExpectError: testutils.RequiresImportError(serviceEndpointName), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccServiceEndpointJFrogXRayV2_RequiresImportErrorStepUsernamePassword(t *testing.T) { | ||
| projectName := testutils.GenerateResourceName() | ||
| serviceEndpointName := testutils.GenerateResourceName() | ||
| resourceType := "azuredevops_serviceendpoint_jfrog_xray_v2" | ||
| tfSvcEpNode := resourceType + ".test" | ||
|
|
||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testutils.PreCheck(t, nil) }, | ||
| Providers: testutils.GetProviders(), | ||
| CheckDestroy: testutils.CheckServiceEndpointDestroyed(resourceType), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceBasicUsernamePassword(projectName, serviceEndpointName, t.Name()), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testutils.CheckServiceEndpointExistsWithName(tfSvcEpNode, serviceEndpointName), | ||
| ), | ||
| }, | ||
| { | ||
| Config: hclSvcEndpointJFrogXRayV2ResourceRequiresImport(projectName, serviceEndpointName, t.Name()), | ||
| ExpectError: testutils.RequiresImportError(serviceEndpointName), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceBasic(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| authentication_token { | ||
| token = "redacted" | ||
| } | ||
| url = "http://url.com/1" | ||
| description = "%s" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceBasicUsernamePassword(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| authentication_basic { | ||
| username = "u" | ||
| password = "redacted" | ||
| } | ||
| url = "http://url.com/1" | ||
| description = "%s" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceCompleteUsernamePassword(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| description = "%s" | ||
| authentication_basic { | ||
| username = "u" | ||
| password = "redacted" | ||
| } | ||
| url = "https://url.com/1" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceComplete(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| description = "%s" | ||
| authentication_token { | ||
| token = "redacted" | ||
| } | ||
| url = "https://url.com/1" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceUpdate(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| description = "%s" | ||
| authentication_token { | ||
| token = "redacted2" | ||
| } | ||
| url = "https://url.com/2" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceUpdateUsernamePassword(projectName string, serviceEndpointName string, description string) string { | ||
| serviceEndpointResource := fmt.Sprintf(` | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "test" { | ||
| project_id = azuredevops_project.project.id | ||
| service_endpoint_name = "%s" | ||
| description = "%s" | ||
| authentication_basic { | ||
| username = "u2" | ||
| password = "redacted2" | ||
| } | ||
| url = "https://url.com/2" | ||
| }`, serviceEndpointName, description) | ||
|
|
||
| projectResource := testutils.HclProjectResource(projectName) | ||
| return fmt.Sprintf("%s\n%s", projectResource, serviceEndpointResource) | ||
| } | ||
|
|
||
| func hclSvcEndpointJFrogXRayV2ResourceRequiresImport(projectName string, serviceEndpointName string, description string) string { | ||
| template := hclSvcEndpointJFrogXRayV2ResourceBasic(projectName, serviceEndpointName, description) | ||
| return fmt.Sprintf(` | ||
| %s | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "import" { | ||
| project_id = azuredevops_serviceendpoint_jfrog_xray_v2.test.project_id | ||
| service_endpoint_name = azuredevops_serviceendpoint_jfrog_xray_v2.test.service_endpoint_name | ||
| description = azuredevops_serviceendpoint_jfrog_xray_v2.test.description | ||
| url = azuredevops_serviceendpoint_jfrog_xray_v2.test.url | ||
| authentication_token { | ||
| token = "redacted" | ||
| } | ||
| } | ||
| `, template) | ||
| } | ||
| func hclSvcEndpointJFrogXRayV2ResourceRequiresImportUsernamePassword(projectName string, serviceEndpointName string, description string) string { | ||
| template := hclSvcEndpointJFrogXRayV2ResourceBasicUsernamePassword(projectName, serviceEndpointName, description) | ||
| return fmt.Sprintf(` | ||
| %s | ||
| resource "azuredevops_serviceendpoint_jfrog_xray_v2" "import" { | ||
| project_id = azuredevops_serviceendpoint_jfrog_xray_v2.test.project_id | ||
| service_endpoint_name = azuredevops_serviceendpoint_jfrog_xray_v2.test.service_endpoint_name | ||
| description = azuredevops_serviceendpoint_jfrog_xray_v2.test.description | ||
| url = azuredevops_serviceendpoint_jfrog_xray_v2.test.url | ||
| authentication_basic { | ||
| username = "u" | ||
| password = "redacted" | ||
| } | ||
| } | ||
| `, template) | ||
| } |
Oops, something went wrong.