Fix test compilation, document user_delegate, cover concurrent-update retry (#26)

* Fix non-constant format string vet errors in tests

go vet (run by go test on Go 1.24) rejected fmt.Errorf/t.Fatalf calls passing a dynamic string as the format. The test package failed to compile; this blocked running any tests in it.

* Add docs and example for googleworkspace_user_delegate

The resource shipped in v0.8 but docs were last regenerated before it was added, leaving it the only undocumented resource. Adds the missing example and regenerates the page via tfplugindocs.

* Add unit tests for isConcurrentUpdateError retry predicate

The 412 and 400 'Invalid Input: resource_id' retry paths added for eventual-consistency handling had no coverage. Tests assert both retryable cases plus negative cases so the predicate can't silently widen.

* Correct README to reflect the community fork, not upstream HashiCorp

The README was the upstream template verbatim: it claimed HashiCorp maintainership, carried HashiCorp's experimental-status legal disclaimer, and release/issue/registry/contribution links pointing at the archived upstream. Repoints them at this fork, states the actual maintainer, notes the upstream archival, corrects the Go floor (>= 1.24), and points the Unit tests badge at the new workflow. HashiCorp's MPL copyright and Special Recognition are kept.

* Fix stale TestConsistencyCheckReachedConsistency expectations

Commit 86270a6 lowered numConsistent from 4 to 2 but did not update this test, which still asserted against currConsistent=4 and failed deterministically. Reference numConsistent directly so the test tracks the constant.

* Add Unit tests GitHub Actions workflow

The README advertised a Unit tests badge but no such workflow existed, and the test package was never run in CI. Runs build, vet, and 'make test' on pushes to main and on PRs. Pins actions to current SHAs (checkout v6.0.3, setup-go v6.4.0).

* Bump checkout and setup-go action pins in release workflow

release.yml pinned actions/checkout v3.5.3 and actions/setup-go v4.1.0; bump to current v6.0.3 / v6.4.0 to match the new test workflow.

Author: kisst

.github/workflows/release.yml

@@ -17,11 +17,11 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           # Allow goreleaser to access older tag information.
           fetch-depth: 0
-      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: 'go.mod'
           cache: true

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+# Unit test workflow.
+name: Unit tests
+
+# Run unit tests and vet on pushes to main and on every pull request.
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        with:
+          go-version-file: 'go.mod'
+          cache: true
+      - name: Build
+        run: go build ./...
+      - name: Vet
+        run: go vet ./...
+      - name: Unit tests
+        run: make test

README.md

@@ -1,27 +1,24 @@
 # Terraform Provider Google Workspace
 <a href="https://terraform.io">
-    <img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" alt="Terraform logo" align="right" height="50" />
+    <img src="https://www.datocms-assets.com/2885/1620155116-brandhcterraformverticalcolor.svg" alt="Terraform logo" align="right" height="50" />
 </a>
 
-![Status: Tech Preview](https://img.shields.io/badge/status-experimental-EAAA32) [![Releases](https://img.shields.io/github/release/hashicorp/terraform-provider-googleworkspace.svg)](https://github.com/hashicorp/terraform-provider-googleworkspace/releases)
-[![LICENSE](https://img.shields.io/github/license/hashicorp/terraform-provider-googleworkspace.svg)](https://github.com/hashicorp/terraform-provider-googleworkspace/blob/main/LICENSE)![Unit tests](https://github.com/hashicorp/terraform-provider-googleworkspace/workflows/Unit%20tests/badge.svg)
+[![Releases](https://img.shields.io/github/release/SamuZad/terraform-provider-googleworkspace.svg)](https://github.com/SamuZad/terraform-provider-googleworkspace/releases)
+[![LICENSE](https://img.shields.io/github/license/SamuZad/terraform-provider-googleworkspace.svg)](https://github.com/SamuZad/terraform-provider-googleworkspace/blob/main/LICENSE)
+[![Unit tests](https://github.com/SamuZad/terraform-provider-googleworkspace/actions/workflows/test.yml/badge.svg)](https://github.com/SamuZad/terraform-provider-googleworkspace/actions/workflows/test.yml)
 
 This Google Workspace provider for Terraform allows you to manage domains, users, and groups in your Google Workspace.
 
-This provider is a technical preview, which means it's a community supported project. It still requires extensive testing and polishing to mature into a HashiCorp officially supported project. Please [file issues](https://github.com/hashicorp/terraform-provider-googleworkspace/issues/new/choose) generously and detail your experience while using the provider. We welcome your feedback.
-
-## Experimental Status
-
-By using the software in this repository (the "Software"), you acknowledge that: (1) the Software is still in development, may change, and has not been released as a commercial product by HashiCorp and is not currently supported in any way by HashiCorp; (2) the Software is provided on an "as-is" basis, and may include bugs, errors, or other issues; (3) the Software is NOT INTENDED FOR PRODUCTION USE, use of the Software may result in unexpected results, loss of data, or other unexpected results, and HashiCorp disclaims any and all liability resulting from use of the Software; and (4) HashiCorp reserves all rights to make all decisions about the features, functionality and commercial release (or non-release) of the Software, at any time and without any obligation or liability whatsoever.
+This is a community-maintained fork of the [`hashicorp/terraform-provider-googleworkspace`](https://github.com/hashicorp/terraform-provider-googleworkspace) provider, which was archived by HashiCorp on 2025-06-30. It is published to the Terraform Registry as [`SamuZad/googleworkspace`](https://registry.terraform.io/providers/SamuZad/googleworkspace/latest). Please [file issues](https://github.com/SamuZad/terraform-provider-googleworkspace/issues/new/choose) generously and detail your experience while using the provider. We welcome your feedback.
 
 ## Maintainers
 
-This provider plugin is maintained by the Terraform team at [HashiCorp](https://www.hashicorp.com/)
+This fork is maintained by [@SamuZad](https://github.com/SamuZad). It descends from the original `hashicorp/terraform-provider-googleworkspace`, which is no longer maintained upstream.
 
 ## Requirements
 
--	[Terraform](https://www.terraform.io/downloads.html) >= 0.13.x
--	[Go](https://golang.org/doc/install) >= 1.16
+-	[Terraform](https://www.terraform.io/downloads.html) >= 0.13.x (or [OpenTofu](https://opentofu.org))
+-	[Go](https://golang.org/doc/install) >= 1.24 (to build the provider)
 
 ## Upgrading the provider
 
@@ -59,7 +56,7 @@ Then commit the changes to `go.mod` and `go.sum`.
 
 ## Using The provider
 
-See the [Google Workspace Provider documentation](https://registry.terraform.io/providers/hashicorp/googleworkspace/latest/docs) to get started using the
+See the [Google Workspace Provider documentation](https://registry.terraform.io/providers/SamuZad/googleworkspace/latest/docs) to get started using the
 Google Workspace provider.
 
 ## Developing the Provider
@@ -78,7 +75,7 @@ In order to run the full suite of Acceptance tests, run `make testacc`.
 $ make testacc
 ```
 
-For guidance on common development practices such as testing changes, see the [contribution guidelines](https://github.com/hashicorp/terraform-provider-googleworkspace/blob/main/.github/CONTRIBUTING.md).
+For guidance on common development practices such as testing changes, see the [contribution guidelines](https://github.com/SamuZad/terraform-provider-googleworkspace/blob/main/.github/CONTRIBUTING.md).
 If you have other development questions we don't cover, please file an issue!
 
 ## Special Recognition

docs/resources/user_delegate.md

@@ -0,0 +1,80 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "googleworkspace_user_delegate Resource - terraform-provider-googleworkspace"
+subcategory: ""
+description: |-
+  User Delegate resource manages delagation of access to a Gmail user mailbox. User Delegate resides under the https://www.googleapis.com/auth/gmail.settings.sharing client scope.
+---
+
+# googleworkspace_user_delegate (Resource)
+
+User Delegate resource manages delagation of access to a Gmail user mailbox. User Delegate resides under the `https://www.googleapis.com/auth/gmail.settings.sharing` client scope.
+
+## Example Usage
+
+```terraform
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+resource "googleworkspace_user" "manager" {
+  primary_email = "manager@example.com"
+  password      = "34819d7beeabb9260a5c854bc85b3e44"
+  hash_function = "MD5"
+
+  name {
+    family_name = "Scott"
+    given_name  = "Michael"
+  }
+}
+
+resource "googleworkspace_user" "assistant" {
+  primary_email = "assistant@example.com"
+  password      = "34819d7beeabb9260a5c854bc85b3e44"
+  hash_function = "MD5"
+
+  name {
+    family_name = "Martin"
+    given_name  = "Pam"
+  }
+}
+
+# Grant the assistant delegated access to the manager's Gmail mailbox.
+resource "googleworkspace_user_delegate" "assistant_to_manager" {
+  user_id        = googleworkspace_user.manager.primary_email
+  delegate_email = googleworkspace_user.assistant.primary_email
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `delegate_email` (String) The email address of the delegate.
+- `user_id` (String) The user's email address.
+
+### Optional
+
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `delegate_verification_status` (String) Indicates whether this address has been verified and can act as a delegate for the account. Read-only.
+- `id` (String) The ID of this resource.
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `create` (String)
+- `update` (String)
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+terraform import googleworkspace_user_delegate.assistant_to_manager manager@example.com:assistant@example.com
+```

examples/resources/googleworkspace_user_delegate/import.sh

@@ -0,0 +1,3 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+terraform import googleworkspace_user_delegate.assistant_to_manager manager@example.com:assistant@example.com

examples/resources/googleworkspace_user_delegate/resource.tf

@@ -0,0 +1,29 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+resource "googleworkspace_user" "manager" {
+  primary_email = "manager@example.com"
+  password      = "34819d7beeabb9260a5c854bc85b3e44"
+  hash_function = "MD5"
+
+  name {
+    family_name = "Scott"
+    given_name  = "Michael"
+  }
+}
+
+resource "googleworkspace_user" "assistant" {
+  primary_email = "assistant@example.com"
+  password      = "34819d7beeabb9260a5c854bc85b3e44"
+  hash_function = "MD5"
+
+  name {
+    family_name = "Martin"
+    given_name  = "Pam"
+  }
+}
+
+# Grant the assistant delegated access to the manager's Gmail mailbox.
+resource "googleworkspace_user_delegate" "assistant_to_manager" {
+  user_id        = googleworkspace_user.manager.primary_email
+  delegate_email = googleworkspace_user.assistant.primary_email
+}

internal/provider/eventual_consistency_test.go

@@ -34,16 +34,18 @@ func TestConsistencyCheckReachedConsistency(t *testing.T) {
 		t.Errorf("Failed: did not reach consistency (numInserts: %d, currConsistent: %d, etagChanges: %d, timeout: %d)", numInserts, cc.currConsistent, cc.etagChanges, int(cc.timeout.Minutes()))
 	}
 
-	// We've seen all the inserts come through, but we haven't had 4 consistent tags yet
+	// We've seen all the inserts come through, but we haven't reached
+	// numConsistent consecutive consistent tags yet
 	cc.etagChanges = 3
 	cc.currConsistent = 1
 
 	if cc.reachedConsistency(numInserts) {
 		t.Errorf("Failed: reached consistency (numInserts: %d, currConsistent: %d, etagChanges: %d, timeout: %d)", numInserts, cc.currConsistent, cc.etagChanges, int(cc.timeout.Minutes()))
 	}
 
-	// We've seen all the inserts come through, and it's been consistent 4 times
-	cc.currConsistent = 4
+	// We've seen all the inserts come through, and it's been consistent
+	// numConsistent times
+	cc.currConsistent = numConsistent
 
 	if !cc.reachedConsistency(numInserts) {
 		t.Errorf("Failed: did not reach consistency (numInserts: %d, currConsistent: %d, etagChanges: %d, timeout: %d)", numInserts, cc.currConsistent, cc.etagChanges, int(cc.timeout.Minutes()))

internal/provider/provider_config_test.go

@@ -43,7 +43,7 @@ func TestConfigLoadAndValidate_credsJSON(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -56,7 +56,7 @@ func TestConfigLoadAndValidate_credsFromFile(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err := checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -77,13 +77,13 @@ func TestAccConfigLoadAndValidate_credsFromEnv(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err := checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	diags = checkValidCreds(config)
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -95,7 +95,7 @@ func TestConfigLoadAndValidate_credsNoImpersonation(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err := checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -109,7 +109,7 @@ func TestConfigOauthScopes_custom(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err := checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	if len(config.ClientScopes) != 1 {
@@ -152,12 +152,12 @@ func TestConfigLoadAndValidate_accessToken(t *testing.T) {
 	diags := gcpConfig.loadAndValidate(context.Background())
 	err := checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	iamCredsService, err := iamcredentials.NewService(context.Background(), option.WithHTTPClient(gcpConfig.client))
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 	serviceAccount := fmt.Sprintf("projects/-/serviceAccounts/%s", os.Getenv("GOOGLEWORKSPACE_IMPERSONATED_SERVICE_ACCOUNT"))
 	tokenRequest := &iamcredentials.GenerateAccessTokenRequest{
@@ -166,7 +166,7 @@ func TestConfigLoadAndValidate_accessToken(t *testing.T) {
 	}
 	at, err := iamCredsService.Projects.ServiceAccounts.GenerateAccessToken(serviceAccount, tokenRequest).Do()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	config := &apiClient{
@@ -179,13 +179,13 @@ func TestConfigLoadAndValidate_accessToken(t *testing.T) {
 	diags = config.loadAndValidate(context.Background())
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	diags = checkValidCreds(config)
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 
@@ -233,13 +233,13 @@ func TestConfigLoadAndValidate_accessTokenOnly(t *testing.T) {
 	diags := config.loadAndValidate(context.Background())
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 
 	diags = checkValidCredsGroupAdmin(config)
 	err = checkDiags(diags)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%s", err.Error())
 	}
 }
 

internal/provider/provider_test.go

@@ -75,7 +75,7 @@ func googleworkspaceTestClient() (*apiClient, error) {
 	diags := client.loadAndValidate(context.Background())
 	if diags.HasError() {
 		log.Printf("[INFO][SWEEPER_LOG] error loading: %s", diags[0].Summary)
-		return nil, fmt.Errorf(diags[0].Summary)
+		return nil, fmt.Errorf("%s", diags[0].Summary)
 	}
 
 	return client, nil

internal/provider/resource_domain_alias_sweeper_test.go

@@ -32,13 +32,13 @@ func testSweepDomainAlias(region string) error {
 	directoryService, diags := client.NewDirectoryService()
 	if diags.HasError() {
 		log.Printf("[INFO][SWEEPER_LOG] Error creating directory service: %s", diags[0].Summary)
-		return fmt.Errorf(diags[0].Summary)
+		return fmt.Errorf("%s", diags[0].Summary)
 	}
 
 	domainAliasesService, diags := GetDomainAliasesService(directoryService)
 	if diags.HasError() {
 		log.Printf("[INFO][SWEEPER_LOG] Error getting domain aliases service: %s", diags[0].Summary)
-		return fmt.Errorf(diags[0].Summary)
+		return fmt.Errorf("%s", diags[0].Summary)
 	}
 
 	domainAliases, err := domainAliasesService.List(client.Customer).Do()