From 86592a9ddeda7544e25817e7e26395f83892d2e7 Mon Sep 17 00:00:00 2001 From: xuzhang3 Date: Fri, 23 Dec 2022 16:35:46 +0800 Subject: recreate file if delete --- azuredevops/internal/service/git/resource_git_repository_file.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azuredevops/internal/service/git/resource_git_repository_file.go b/azuredevops/internal/service/git/resource_git_repository_file.go index 579ce245..653c88fc 100644 --- a/azuredevops/internal/service/git/resource_git_repository_file.go +++ b/azuredevops/internal/service/git/resource_git_repository_file.go @@ -179,7 +179,7 @@ func resourceGitRepositoryFileRead(d *schema.ResourceData, m interface{}) error if err != nil { if utils.ResponseWasNotFound(err) { d.SetId("") - return err + return nil } return fmt.Errorf("Query repository item failed, repositoryID: %s, branch: %s, file: %s . Error: %+v", repoId, branch, file, err) } -- cgit v1.2.3 From 0f5844e032a4d639104e4f87421051063a4a31fd Mon Sep 17 00:00:00 2001 From: xuzhang3 Date: Fri, 23 Dec 2022 16:55:46 +0800 Subject: bump go from 1.18 to 1.19 --- .../acceptancetests/data_git_repositories_test.go | 1 + .../acceptancetests/data_git_repository_test.go | 1 + .../internal/acceptancetests/data_project_test.go | 1 + .../internal/acceptancetests/resource_agentpool_test.go | 1 + .../acceptancetests/resource_environment_test.go | 1 + .../acceptancetests/resource_git_repository_test.go | 3 ++- .../acceptancetests/resource_group_membership_test.go | 4 ++-- .../internal/acceptancetests/resource_project_test.go | 15 ++++++++------- .../internal/service/build/build_definition_helper.go | 6 +++--- .../service/git/resource_git_repository_test.go | 1 + azuredevops/internal/service/graph/data_group.go | 1 + azuredevops/internal/service/graph/data_groups.go | 1 + .../internal/service/graph/resource_group_test.go | 6 +++--- azuredevops/internal/service/policy/branch/common.go | 1 + .../internal/service/policy/repository/common.go | 1 + azuredevops/internal/service/serviceendpoint/commons.go | 2 +- .../service/taskagent/resource_variable_group.go | 3 ++- azuredevops/internal/utils/tfhelper/tfhelper.go | 17 ++++++++++------- go.mod | 2 +- 19 files changed, 42 insertions(+), 26 deletions(-) diff --git a/azuredevops/internal/acceptancetests/data_git_repositories_test.go b/azuredevops/internal/acceptancetests/data_git_repositories_test.go index 08f8ce4d..70e0eecf 100644 --- a/azuredevops/internal/acceptancetests/data_git_repositories_test.go +++ b/azuredevops/internal/acceptancetests/data_git_repositories_test.go @@ -13,6 +13,7 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF can create a project // (2) A data source is added to the configuration, and that data source can find the created project func TestAccAzureTfsGitRepositories_DataSource(t *testing.T) { diff --git a/azuredevops/internal/acceptancetests/data_git_repository_test.go b/azuredevops/internal/acceptancetests/data_git_repository_test.go index 4bcd1852..a2553d89 100644 --- a/azuredevops/internal/acceptancetests/data_git_repository_test.go +++ b/azuredevops/internal/acceptancetests/data_git_repository_test.go @@ -13,6 +13,7 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF can create a project // (2) A data source is added to the configuration, and that data source can find the created project func TestAccGitRepository_DataSource(t *testing.T) { diff --git a/azuredevops/internal/acceptancetests/data_project_test.go b/azuredevops/internal/acceptancetests/data_project_test.go index bcbc6751..550ebb0a 100644 --- a/azuredevops/internal/acceptancetests/data_project_test.go +++ b/azuredevops/internal/acceptancetests/data_project_test.go @@ -14,6 +14,7 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF can create a project // (2) A data source is added to the configuration, and that data source can find the created project func TestAccProject_DataSource(t *testing.T) { diff --git a/azuredevops/internal/acceptancetests/resource_agentpool_test.go b/azuredevops/internal/acceptancetests/resource_agentpool_test.go index a355d7a9..5f89d4a4 100644 --- a/azuredevops/internal/acceptancetests/resource_agentpool_test.go +++ b/azuredevops/internal/acceptancetests/resource_agentpool_test.go @@ -17,6 +17,7 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF apply creates agent pool // (2) TF state values are set // (3) Agent pool can be queried by ID and has expected name diff --git a/azuredevops/internal/acceptancetests/resource_environment_test.go b/azuredevops/internal/acceptancetests/resource_environment_test.go index b5f98246..46afc351 100644 --- a/azuredevops/internal/acceptancetests/resource_environment_test.go +++ b/azuredevops/internal/acceptancetests/resource_environment_test.go @@ -18,6 +18,7 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF apply creates environment // (2) TF state values are set // (3) Environment can be queried by ID and has expected name diff --git a/azuredevops/internal/acceptancetests/resource_git_repository_test.go b/azuredevops/internal/acceptancetests/resource_git_repository_test.go index 46d00ece..9e26bc86 100644 --- a/azuredevops/internal/acceptancetests/resource_git_repository_test.go +++ b/azuredevops/internal/acceptancetests/resource_git_repository_test.go @@ -18,10 +18,11 @@ import ( ) // Verifies that the following sequence of events occurrs without error: +// // (1) TF apply creates resource // (2) TF state values are set // (3) resource can be queried by ID and has expected name -// (4) TF destroy deletes resource +// (4) TF destroy deletes resource // (5) resource can no longer be queried by ID func TestAccGitRepo_CreateAndUpdate(t *testing.T) { projectName := testutils.GenerateResourceName() diff --git a/azuredevops/internal/acceptancetests/resource_group_membership_test.go b/azuredevops/internal/acceptancetests/resource_group_membership_test.go index 9a525f0f..bc5ed983 100644 --- a/azuredevops/internal/acceptancetests/resource_group_membership_test.go +++ b/azuredevops/internal/acceptancetests/resource_group_membership_test.go @@ -20,13 +20,13 @@ import ( ) // Verifies that the following sequence of events occurs without error: +// // (1) TF apply creates resource // (2) TF state values are set // (3) Group membership exists and can be queried for -// (4) TF destroy removes group memberships +// (4) TF destroy removes group memberships // // Note: This will be uncommented in https://github.com/microsoft/terraform-provider-azuredevops/issues/174 -// func TestAccGroupMembership_CreateAndRemove(t *testing.T) { t.Skip("Skipping test TestAccGroupMembership_CreateAndRemove due to service inconsistent") projectName := testutils.GenerateResourceName() diff --git a/azuredevops/internal/acceptancetests/resource_project_test.go b/azuredevops/internal/acceptancetests/resource_project_test.go index 24dc6fdb..e42a5a8a 100644 --- a/azuredevops/internal/acceptancetests/resource_project_test.go +++ b/azuredevops/internal/acceptancetests/resource_project_test.go @@ -12,13 +12,14 @@ import ( ) // Verifies that the following sequence of events occurs without error: -// (1) TF apply creates project -// (2) TF state values are set -// (3) project can be queried by ID and has expected name -// (4) TF apply update project with changing name -// (5) project can be queried by ID and has expected name -// (6) TF destroy deletes project -// (7) project can no longer be queried by ID +// +// (1) TF apply creates project +// (2) TF state values are set +// (3) project can be queried by ID and has expected name +// (4) TF apply update project with changing name +// (5) project can be queried by ID and has expected name +// (6) TF destroy deletes project +// (7) project can no longer be queried by ID func TestAccProject_CreateAndUpdate(t *testing.T) { projectNameFirst := testutils.GenerateResourceName() projectNameSecond := testutils.GenerateResourceName() diff --git a/azuredevops/internal/service/build/build_definition_helper.go b/azuredevops/internal/service/build/build_definition_helper.go index 2bd1125f..b494abab 100644 --- a/azuredevops/internal/service/build/build_definition_helper.go +++ b/azuredevops/internal/service/build/build_definition_helper.go @@ -20,9 +20,9 @@ var DaysToBuild = map[string]int{ "all": 127, } -//DaysToDate days to date -//1 -> [Mon] -//31 -> [Mon, Tue, Wed, Thu, Fri] +// DaysToDate days to date +// 1 -> [Mon] +// 31 -> [Mon, Tue, Wed, Thu, Fri] func DaysToDate(dayToBuild int) []string { var days []string for _, day := range Date { diff --git a/azuredevops/internal/service/git/resource_git_repository_test.go b/azuredevops/internal/service/git/resource_git_repository_test.go index 482621ce..07973cf4 100644 --- a/azuredevops/internal/service/git/resource_git_repository_test.go +++ b/azuredevops/internal/service/git/resource_git_repository_test.go @@ -101,6 +101,7 @@ func configureCleanInitialization(d *schema.ResourceData) { } // verifies that a round-trip flatten/expand sequence will not result in data loss of non-computed properties. +// // Note: there is no need to expand computed properties, so they won't be tested here. func TestGitRepo_FlattenExpand_RoundTrip(t *testing.T) { projectID := uuid.New() diff --git a/azuredevops/internal/service/graph/data_group.go b/azuredevops/internal/service/graph/data_group.go index f52908fb..c24c2f35 100644 --- a/azuredevops/internal/service/graph/data_group.go +++ b/azuredevops/internal/service/graph/data_group.go @@ -44,6 +44,7 @@ func DataGroup() *schema.Resource { } // Performs a lookup of a project group. This involves the following actions: +// // (1) Identify AzDO graph descriptor for the project in which the group exists // (2) Query for all AzDO groups that exist within the project. This leverages the AzDO graph descriptor for the project. // This involves querying a paginated API, so multiple API calls may be needed for this step. diff --git a/azuredevops/internal/service/graph/data_groups.go b/azuredevops/internal/service/graph/data_groups.go index ada77d30..b7f67333 100644 --- a/azuredevops/internal/service/graph/data_groups.go +++ b/azuredevops/internal/service/graph/data_groups.go @@ -80,6 +80,7 @@ func DataGroups() *schema.Resource { } // Performs a lookup of a project group. This involves the following actions: +// // (1) Identify AzDO graph descriptor for the project in which the group exists // (2) Query for all AzDO groups that exist within the project. This leverages the AzDO graph descriptor for the project. // This involves querying a paginated API, so multiple API calls may be needed for this step. diff --git a/azuredevops/internal/service/graph/resource_group_test.go b/azuredevops/internal/service/graph/resource_group_test.go index 64967fce..9dd563a8 100644 --- a/azuredevops/internal/service/graph/resource_group_test.go +++ b/azuredevops/internal/service/graph/resource_group_test.go @@ -20,14 +20,14 @@ import ( "github.com/stretchr/testify/require" ) -//var descriptor = "vssgp.Uy0xLTktMTU1MTM3NDI0NS01OTMwNjE4OTktMTUzMjM2ODQ0OC0yNjEwNDc0OTEzLTIwMTI3MjY3MjgtMS00MTA1Mjg5ODQ0LTUxNzgwOTc0My0yNDc0MDIwNDA4LTI5NDAwMzQ4NTk" -//var origin = "TEST_ORIGIN" +// var descriptor = "vssgp.Uy0xLTktMTU1MTM3NDI0NS01OTMwNjE4OTktMTUzMjM2ODQ0OC0yNjEwNDc0OTEzLTIwMTI3MjY3MjgtMS00MTA1Mjg5ODQ0LTUxNzgwOTc0My0yNDc0MDIwNDA4LTI5NDAwMzQ4NTk" +// var origin = "TEST_ORIGIN" var originID = "5d466068-fe00-47c8-80d7-bb268165820c" var displayName = "TEST_GROUP" //var description = "TEST_DESCRIPTION" -//var orgurl = "https://dev.azure.com/_test_organization" +// var orgurl = "https://dev.azure.com/_test_organization" var email = "test_group@test.local" //var subjectKind = "group" diff --git a/azuredevops/internal/service/policy/branch/common.go b/azuredevops/internal/service/policy/branch/common.go index fef582e1..d4992578 100644 --- a/azuredevops/internal/service/policy/branch/common.go +++ b/azuredevops/internal/service/policy/branch/common.go @@ -24,6 +24,7 @@ import ( */ // Policy type IDs. These are global and can be listed using the following endpoint: +// // https://docs.microsoft.com/en-us/rest/api/azure/devops/policy/types/list?view=azure-devops-rest-5.1 var ( MinReviewerCount = uuid.MustParse("fa4e907d-c16b-4a4c-9dfa-4906e5d171dd") diff --git a/azuredevops/internal/service/policy/repository/common.go b/azuredevops/internal/service/policy/repository/common.go index f480c863..a7d8866a 100644 --- a/azuredevops/internal/service/policy/repository/common.go +++ b/azuredevops/internal/service/policy/repository/common.go @@ -16,6 +16,7 @@ import ( ) // Policy type IDs. These are global and can be listed using the following endpoint: +// // https://docs.microsoft.com/en-us/rest/api/azure/devops/policy/types/list?view=azure-devops-rest-5.1 var ( AuthorEmailPattern = uuid.MustParse("77ed4bd3-b063-4689-934a-175e4d0a78d7") diff --git a/azuredevops/internal/service/serviceendpoint/commons.go b/azuredevops/internal/service/serviceendpoint/commons.go index 5069f804..b07eb74f 100644 --- a/azuredevops/internal/service/serviceendpoint/commons.go +++ b/azuredevops/internal/service/serviceendpoint/commons.go @@ -285,7 +285,7 @@ func createServiceEndpoint(clients *client.AggregatedClient, endpoint *serviceen return createdServiceEndpoint, err } -//Service endpoint delete is an async operation, make sure service endpoint is deleted. +// Service endpoint delete is an async operation, make sure service endpoint is deleted. func checkServiceEndpointStatus(clients *client.AggregatedClient, projectID *uuid.UUID, endPointID *uuid.UUID) resource.StateRefreshFunc { return func() (interface{}, string, error) { serviceEndpoint, err := clients.ServiceEndpointClient.GetServiceEndpointDetails( diff --git a/azuredevops/internal/service/taskagent/resource_variable_group.go b/azuredevops/internal/service/taskagent/resource_variable_group.go index 8657b763..a03ac248 100644 --- a/azuredevops/internal/service/taskagent/resource_variable_group.go +++ b/azuredevops/internal/service/taskagent/resource_variable_group.go @@ -441,7 +441,8 @@ func isKeyVaultVariableGroupType(variableGrouptype *string) bool { // Convert AzDO Variables data structure to Terraform TypeSet // // Note: The AzDO API does not return the value for variables marked as a secret. For this reason -// variables marked as secret will need to be pulled from the state itself +// +// variables marked as secret will need to be pulled from the state itself func flattenVariables(d *schema.ResourceData, variableGroup *v5taskagent.VariableGroup) (interface{}, error) { variables := make([]map[string]interface{}, len(*variableGroup.Variables)) diff --git a/azuredevops/internal/utils/tfhelper/tfhelper.go b/azuredevops/internal/utils/tfhelper/tfhelper.go index 4db955af..c4c88646 100644 --- a/azuredevops/internal/utils/tfhelper/tfhelper.go +++ b/azuredevops/internal/utils/tfhelper/tfhelper.go @@ -168,8 +168,9 @@ func ExpandStringSet(d *schema.Set) []string { } // ImportProjectQualifiedResource Import a resource by an ID that looks like one of the following: -// / -// / +// +// / +// / func ImportProjectQualifiedResource() *schema.ResourceImporter { return &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { @@ -190,8 +191,9 @@ func ImportProjectQualifiedResource() *schema.ResourceImporter { } // ImportProjectQualifiedResourceInteger Import a resource by an ID that looks like one of the following: -// / -// / +// +// / +// / func ImportProjectQualifiedResourceInteger() *schema.ResourceImporter { return &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { @@ -217,8 +219,9 @@ func ImportProjectQualifiedResourceInteger() *schema.ResourceImporter { } // ImportProjectQualifiedResourceUUID Import a resource by an ID that looks like one of the following: -// / -// / +// +// / +// / func ImportProjectQualifiedResourceUUID() *schema.ResourceImporter { return &schema.ResourceImporter{ State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { @@ -238,7 +241,7 @@ func ImportProjectQualifiedResourceUUID() *schema.ResourceImporter { } } -//Get real project ID +// Get real project ID func GetRealProjectId(projectNameOrID string, meta interface{}) (string, error) { //If request params is project name, try get the project ID if _, err := uuid.ParseUUID(projectNameOrID); err != nil { diff --git a/go.mod b/go.mod index 4da791b2..ed588005 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/microsoft/terraform-provider-azuredevops -go 1.18 +go 1.19 require ( github.com/ahmetb/go-linq v3.0.0+incompatible -- cgit v1.2.3 From 78dca656ea06fbad7110e47cd3b0fa2a74cee663 Mon Sep 17 00:00:00 2001 From: xuzhang3 Date: Fri, 23 Dec 2022 17:30:58 +0800 Subject: format --- .../internal/acceptancetests/resource_project_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/azuredevops/internal/acceptancetests/resource_project_test.go b/azuredevops/internal/acceptancetests/resource_project_test.go index e42a5a8a..b48eaabe 100644 --- a/azuredevops/internal/acceptancetests/resource_project_test.go +++ b/azuredevops/internal/acceptancetests/resource_project_test.go @@ -13,13 +13,13 @@ import ( // Verifies that the following sequence of events occurs without error: // -// (1) TF apply creates project -// (2) TF state values are set -// (3) project can be queried by ID and has expected name -// (4) TF apply update project with changing name -// (5) project can be queried by ID and has expected name -// (6) TF destroy deletes project -// (7) project can no longer be queried by ID +// (1) TF apply creates project +// (2) TF state values are set +// (3) project can be queried by ID and has expected name +// (4) TF apply update project with changing name +// (5) project can be queried by ID and has expected name +// (6) TF destroy deletes project +// (7) project can no longer be queried by ID func TestAccProject_CreateAndUpdate(t *testing.T) { projectNameFirst := testutils.GenerateResourceName() projectNameSecond := testutils.GenerateResourceName() -- cgit v1.2.3