Merge pull request #229 from DrFaust92/default_branch_deletion

Default_branch_deletion

Author: DrFaust92

.github/workflows/lint.yml

@@ -7,12 +7,12 @@ jobs:
     name: Run linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.19'
-      - uses: actions/checkout@v3          
+          go-version-file: "go.mod"
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.50.1
-          only-new-issues: true
+          version: v2.1
+          only-new-issues: true

.golangci.yml

@@ -1,3 +1,33 @@
-linters-settings:
-  errcheck:
-    ignore: Set
+version: "2"
+linters:
+  default: none
+  enable:
+    - durationcheck
+    - govet
+    - ineffassign
+    - makezero
+    - misspell
+    - nilerr
+    - staticcheck
+    - unconvert
+    - unused
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

bitbucket/provider_test.go

@@ -24,25 +24,25 @@ func TestProvider(t *testing.T) {
 }
 
 func TestProvider_impl(t *testing.T) {
-	var _ *schema.Provider = Provider()
+	var _ = Provider()
 }
 
 func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("BITBUCKET_USERNAME"); v == "" {
-		t.Fatal("BITBUCKET_USERNAME must be set for acceptence tests")
+		t.Fatal("BITBUCKET_USERNAME must be set for acceptance tests")
 	}
 
 	if v := os.Getenv("BITBUCKET_PASSWORD"); v == "" {
-		t.Fatal("BITBUCKET_PASSWORD must be set for acceptence tests")
+		t.Fatal("BITBUCKET_PASSWORD must be set for acceptance tests")
 	}
 
 	if v := os.Getenv("BITBUCKET_TEAM"); v == "" {
-		t.Fatal("BITBUCKET_TEAM must be set for acceptence tests")
+		t.Fatal("BITBUCKET_TEAM must be set for acceptance tests")
 	}
 }
 
 func testAccPreCheckPipeSchedule(t *testing.T) {
 	if v := os.Getenv("BITBUCKET_PIPELINED_REPO"); v == "" {
-		t.Fatal("BITBUCKET_PIPELINED_REPO must be set for acceptence tests")
+		t.Fatal("BITBUCKET_PIPELINED_REPO must be set for acceptance tests")
 	}
 }

bitbucket/resource_branch_restriction.go

@@ -199,7 +199,7 @@ func resourceBranchRestrictionsCreate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	d.SetId(string(fmt.Sprintf("%v", branchRestrictionReq.Id)))
+	d.SetId(fmt.Sprintf("%v", branchRestrictionReq.Id))
 
 	return resourceBranchRestrictionsRead(ctx, d, m)
 }
@@ -221,7 +221,7 @@ func resourceBranchRestrictionsRead(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	d.SetId(string(fmt.Sprintf("%v", brRes.Id)))
+	d.SetId(fmt.Sprintf("%v", brRes.Id))
 	d.Set("kind", brRes.Kind)
 	d.Set("pattern", brRes.Pattern)
 	d.Set("value", brRes.Value)

bitbucket/resource_branching_model.go

@@ -17,9 +17,10 @@ import (
 
 // BranchingModel is the data we need to send to create a new branching model for the repository
 type BranchingModel struct {
-	Development *BranchModel  `json:"development,omitempty"`
-	Production  *BranchModel  `json:"production,omitempty"`
-	BranchTypes []*BranchType `json:"branch_types"`
+	Development           *BranchModel  `json:"development,omitempty"`
+	Production            *BranchModel  `json:"production,omitempty"`
+	BranchTypes           []*BranchType `json:"branch_types"`
+	DefaultBranchDeletion *bool         `json:"default_branch_deletion,omitempty"`
 }
 
 type BranchModel struct {
@@ -138,6 +139,10 @@ func resourceBranchingModel() *schema.Resource {
 					},
 				},
 			},
+			"default_branch_deletion": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -172,7 +177,7 @@ func resourceBranchingModelsPut(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(decodeerr)
 	}
 
-	d.SetId(string(fmt.Sprintf("%s/%s", d.Get("owner").(string), d.Get("repository").(string))))
+	d.SetId(fmt.Sprintf("%s/%s", d.Get("owner").(string), d.Get("repository").(string)))
 
 	return resourceBranchingModelsRead(ctx, d, m)
 }
@@ -221,6 +226,7 @@ func resourceBranchingModelsRead(ctx context.Context, d *schema.ResourceData, m
 
 	d.Set("owner", owner)
 	d.Set("repository", repo)
+	d.Set("default_branch_deletion", branchingModel.DefaultBranchDeletion)
 	d.Set("development", flattenBranchModel(branchingModel.Development, "development"))
 	d.Set("branch_type", flattenBranchTypes(branchingModel.BranchTypes))
 	d.Set("production", flattenBranchModel(branchingModel.Production, "production"))
@@ -262,6 +268,11 @@ func expandBranchingModel(d *schema.ResourceData) *BranchingModel {
 		model.BranchTypes = make([]*BranchType, 0)
 	}
 
+	//nolint:staticcheck
+	if v, ok := d.GetOkExists("default_branch_deletion"); ok {
+		model.DefaultBranchDeletion = v.(*bool)
+	}
+
 	return model
 }
 
@@ -383,7 +394,7 @@ func branchingModelId(id string) (string, string, error) {
 	parts := strings.Split(id, "/")
 
 	if len(parts) != 2 {
-		return "", "", fmt.Errorf("Unexpected format of ID (%q), expected OWNER/REPOSITORY", id)
+		return "", "", fmt.Errorf("unexpected format of ID (%q), expected OWNER/REPOSITORY", id)
 	}
 
 	return parts[0], parts[1], nil

bitbucket/resource_commit_file.go

@@ -128,7 +128,7 @@ func resourceCommitFilePut(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(fmt.Errorf(""))
 	}
 
-	d.SetId(string(fmt.Sprintf("%s/%s/%s/%s", workspace, repoSlug, branch, filename)))
+	d.SetId(fmt.Sprintf("%s/%s/%s/%s", workspace, repoSlug, branch, filename))
 
 	location, _ := res.Location()
 	splitPath := strings.Split(location.Path, "/")

bitbucket/resource_deploy_key.go

@@ -91,7 +91,7 @@ func resourceDeployKeysCreate(ctx context.Context, d *schema.ResourceData, m int
 
 	log.Printf("[DEBUG] Deploy Keys Create Response Decoded: %#v", deployKeyRes)
 
-	d.SetId(string(fmt.Sprintf("%s/%s/%d", workspace, repo, deployKeyRes.ID)))
+	d.SetId(fmt.Sprintf("%s/%s/%d", workspace, repo, deployKeyRes.ID))
 
 	return resourceDeployKeysRead(ctx, d, m)
 }

bitbucket/resource_forked_repository.go

@@ -136,10 +136,10 @@ func resourceForkedRepository() *schema.Resource {
 				ValidateFunc: func(val interface{}, key string) (warns []string, errs []error) {
 					v := val.(map[string]interface{})
 					if _, ok := v["slug"]; !ok {
-						errs = append(errs, fmt.Errorf("A repository 'slug' is required when specifying a parent to fork from."))
+						errs = append(errs, fmt.Errorf("a repository 'slug' is required when specifying a parent to fork from"))
 					}
 					if _, ok := v["owner"]; !ok {
-						errs = append(errs, fmt.Errorf("A repository 'owner' is required when specifying a parent to fork from."))
+						errs = append(errs, fmt.Errorf("a repository 'owner' is required when specifying a parent to fork from"))
 					}
 					return warns, errs
 				},
@@ -215,16 +215,17 @@ func resourceForkedRepositoryCreate(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	d.SetId(string(fmt.Sprintf("%s/%s", d.Get("owner").(string), repoSlug)))
+	d.SetId(fmt.Sprintf("%s/%s", d.Get("owner").(string), repoSlug))
 
 	pipelinesEnabled := d.Get("pipelines_enabled").(bool)
 	pipelinesConfig := &bitbucket.PipelinesConfig{Enabled: pipelinesEnabled}
 
+	//nolint:all
 	retryErr := resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
 		_, pipelineResponse, err := pipeApi.UpdateRepositoryPipelineConfig(c.AuthContext, *pipelinesConfig, workspace, repoSlug)
 		if pipelineResponse.StatusCode == 403 || pipelineResponse.StatusCode == 404 {
 			return resource.RetryableError(
-				fmt.Errorf("Permissions error setting Pipelines config, retrying..."),
+				fmt.Errorf("permissions error setting Pipelines config, retrying"),
 			)
 		}
 
@@ -315,9 +316,10 @@ func resourceForkedRepositoryRead(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	if res.StatusCode == 200 {
+	switch res.StatusCode {
+	case http.StatusOK:
 		d.Set("pipelines_enabled", pipelinesConfigReq.Enabled)
-	} else if res.StatusCode == http.StatusNotFound {
+	case http.StatusNotFound:
 		d.Set("pipelines_enabled", false)
 	}
 

bitbucket/resource_group.go

@@ -91,7 +91,7 @@ func resourceGroupsCreate(ctx context.Context, d *schema.ResourceData, m interfa
 
 	log.Printf("[DEBUG] Group Req Response Decoded: %#v", group)
 
-	d.SetId(string(fmt.Sprintf("%s/%s", workspace, group.Slug)))
+	d.SetId(fmt.Sprintf("%s/%s", workspace, group.Slug))
 
 	return resourceGroupsRead(ctx, d, m)
 }

bitbucket/resource_group_membership.go

@@ -63,7 +63,7 @@ func resourceGroupMembershipsPut(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
-	d.SetId(string(fmt.Sprintf("%s/%s/%s", workspace, groupSlug, uuid)))
+	d.SetId(fmt.Sprintf("%s/%s/%s", workspace, groupSlug, uuid))
 
 	return resourceGroupMembershipsRead(ctx, d, m)
 }