Sync

.github/workflows/documentation.yml

@@ -15,7 +15,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
     - uses: gaurav-nelson/github-action-markdown-link-check@v1
       with:
         use-quiet-mode: 'yes'
@@ -26,7 +26,7 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - uses: avto-dev/markdown-lint@v1
         with:
           config: '.markdownlint.yml'

.github/workflows/lint.yml

@@ -7,12 +7,11 @@ jobs:
     name: Run linter
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         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
+          only-new-issues: true

.github/workflows/release.yml

@@ -1,51 +1,27 @@
 # This GitHub action can publish assets for release when a tag is created.
 # Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0).
 #
-# This uses an action (hashicorp/ghaction-import-gpg) that assumes you set your 
+# This uses an action (hashicorp/ghaction-import-gpg) that assumes you set your
 # private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE`
 # secret. If you would rather own your own GPG handling, please fork this action
 # or use an alternative one for key handling.
 #
-# You will need to pass the `--batch` flag to `gpg` in your signing step 
+# You will need to pass the `--batch` flag to `gpg` in your signing step
 # in `goreleaser` to indicate this is being used in a non-interactive mode.
 #
 name: release
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 permissions:
   contents: write
 jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Unshallow
-        run: git fetch --prune --unshallow
-      -
-        name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version-file: 'go.mod'
-          cache: true
-      -
-        name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5
-        id: import_gpg
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.PASSPHRASE }}
-      -
-        name: Run GoReleaser
-        uses: goreleaser/[email protected]
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
-          # GitHub sets this automatically
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  terraform-provider-release:
+    name: "Terraform Provider Release"
+    uses: hashicorp/ghaction-terraform-provider-release/.github/workflows/community.yml@v5
+    secrets:
+      gpg-private-key: "${{ secrets.GPG_PRIVATE_KEY }}"
+      gpg-private-key-passphrase: "${{ secrets.PASSPHRASE }}"
+    with:
+      setup-go-version-file: "go.mod"

.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$

.goreleaser.yml

@@ -1,44 +1,45 @@
 # Visit https://goreleaser.com for documentation on how to customize this
 # behavior.
+version: 2
 before:
   hooks:
     # this is just an example and not a requirement for provider building/publishing
     - go mod tidy
 builds:
-- env:
-    # goreleaser does not work with CGO, it could also complicate
-    # usage by users in CI/CD systems like Terraform Cloud where
-    # they are unable to install libraries.
-    - CGO_ENABLED=0
-  mod_timestamp: '{{ .CommitTimestamp }}'
-  flags:
-    - -trimpath
-  ldflags:
-    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
-  goos:
-    - freebsd
-    - windows
-    - linux
-    - darwin
-  goarch:
-    - amd64
-    - '386'
-    - arm
-    - arm64
-  ignore:
-    - goos: darwin
-      goarch: '386'
-  binary: '{{ .ProjectName }}_v{{ .Version }}'
+  - env:
+      # goreleaser does not work with CGO, it could also complicate
+      # usage by users in CI/CD systems like Terraform Cloud where
+      # they are unable to install libraries.
+      - CGO_ENABLED=0
+    mod_timestamp: "{{ .CommitTimestamp }}"
+    flags:
+      - -trimpath
+    ldflags:
+      - "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
+    goos:
+      - freebsd
+      - windows
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - "386"
+      - arm
+      - arm64
+    ignore:
+      - goos: darwin
+        goarch: "386"
+    binary: "{{ .ProjectName }}_v{{ .Version }}"
 archives:
-- format: zip
-  name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+  - format: zip
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
 checksum:
-  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  name_template: "{{ .ProjectName }}_{{ .Version }}_SHA256SUMS"
   algorithm: sha256
 signs:
   - artifacts: checksum
     args:
-      # if you are using this in a GitHub action or some other automated pipeline, you 
+      # if you are using this in a GitHub action or some other automated pipeline, you
       # need to pass the batch flag to indicate its not interactive.
       - "--batch"
       - "--local-user"
@@ -51,4 +52,4 @@ release:
   # If you want to manually examine the release before its live, uncomment this line:
   # draft: true
 changelog:
-  skip: true
+  disable: true

.markdownlint.yml

@@ -11,3 +11,5 @@ MD010:
 # https://github.com/DavidAnson/markdownlint/blob/master/doc/Rules.md
 
 MD013: false
+MD033: false
+MD022: false

bitbucket/data_current_user.go

@@ -69,8 +69,8 @@ func dataReadCurrentUser(ctx context.Context, d *schema.ResourceData, m interfac
 	httpClient := m.(Clients).httpClient
 	usersApi := c.ApiClient.UsersApi
 
-	curUser, _, err := usersApi.UserGet(c.AuthContext)
-	if err := handleClientError(err); err != nil {
+	curUser, res, err := usersApi.UserGet(c.AuthContext)
+	if err := handleClientError(res, err); err != nil {
 		return diag.FromErr(err)
 	}
 

bitbucket/data_deployment.go

@@ -57,11 +57,11 @@ func dataReadDeployment(ctx context.Context, d *schema.ResourceData, m interface
 	}
 
 	if res.StatusCode == http.StatusNotFound {
-		return diag.Errorf("user not found")
+		return diag.Errorf("deployment not found")
 	}
 
 	if res.StatusCode >= http.StatusInternalServerError {
-		return diag.Errorf("internal server error fetching user")
+		return diag.Errorf("internal server error fetching deployment")
 	}
 
 	var deploy Deployment

bitbucket/data_deployments.go

@@ -0,0 +1,70 @@
+package bitbucket
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataDeployments() *schema.Resource {
+	return &schema.Resource{
+		ReadWithoutTimeout: dataReadDeployments,
+
+		Schema: map[string]*schema.Schema{
+			"uuids": {
+				Type:     schema.TypeSet,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+				Computed: true,
+			},
+			"workspace": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"repository": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"names": {
+				Type:     schema.TypeSet,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+				Computed: true,
+			},
+		},
+	}
+}
+
+func dataReadDeployments(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(Clients).genClient
+	deployApi := c.ApiClient.DeploymentsApi
+
+	workspace := d.Get("workspace").(string)
+	repoId := d.Get("repository").(string)
+
+	deploymentsResp, res, err := deployApi.GetEnvironmentsForRepository(c.AuthContext, workspace, repoId, nil)
+	if err := handleClientError(res, err); err != nil {
+		return diag.FromErr(err)
+	}
+
+	deployments := deploymentsResp.Values
+
+	log.Printf("haha %#v", deployments)
+
+	var uuids []string
+	for _, deployment := range deployments {
+		uuids = append(uuids, deployment.Uuid)
+	}
+
+	var names []string
+	for _, deployment := range deployments {
+		names = append(names, deployment.Name)
+	}
+
+	d.SetId(fmt.Sprintf("%s/%s", workspace, repoId))
+	d.Set("uuids", uuids)
+	d.Set("names", names)
+
+	return nil
+}

bitbucket/data_deployments_test.go

@@ -0,0 +1,46 @@
+package bitbucket
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccDataSourceDeployments_basic(t *testing.T) {
+	dataSourceName := "data.bitbucket_deployments.test"
+	resourceName := "bitbucket_deployment.test"
+
+	rName := acctest.RandomWithPrefix("tf-test")
+
+	workspace := os.Getenv("BITBUCKET_TEAM")
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBitbucketDeploymentsConfig(workspace, rName, rName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(dataSourceName, "workspace", workspace),
+					resource.TestCheckResourceAttr(dataSourceName, "uuids.#", "1"),
+					resource.TestCheckResourceAttr(dataSourceName, "names.#", "1"),
+					resource.TestCheckResourceAttrPair(dataSourceName, "uuids.0", resourceName, "uuid"),
+					resource.TestCheckResourceAttrPair(dataSourceName, "names.0", resourceName, "name"),
+				),
+			},
+		},
+	})
+}
+
+func testAccBitbucketDeploymentsConfig(workspace, repoName, deployName string) string {
+	return testAccBitbucketDeployment(workspace, repoName, deployName) + fmt.Sprintf(`
+data "bitbucket_deployments" "test" {
+  workspace  = %[1]q
+  repository = bitbucket_repository.test.slug
+
+  depends_on = [bitbucket_deployment.test]
+}
+`, workspace)
+}