From 03c23dec8dfd1a997ee6046663473b122bcdb4da Mon Sep 17 00:00:00 2001
From: twelsh-aw <84401379+twelsh-aw@users.noreply.github.com>
Date: Fri, 23 Aug 2024 10:59:23 -0400
Subject: [PATCH] Make acceptance tests something manually kicked off

---
 .github/pull_request_template.md | 38 ++++++++++++++++++++++++++++++++
 .github/workflows/acctest.yaml   | 11 ++-------
 2 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..2544028
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,38 @@
+<!---
+See what makes a good Pull Request at: https://github.com/docker/terraform-provider-docker/blob/main/CONTRIBUTING.md#making-code-contributions/
+--->
+### Description
+<!---
+Please provide a helpful description of what change this pull request will introduce.
+--->
+
+### Relations
+<!---
+If your pull request fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates.
+
+For Example:
+
+Relates #0000
+or 
+Closes #0000
+--->
+
+Closes #0000
+
+### References
+<!---
+Optionally, provide any helpful references that may help the reviewer(s).
+--->
+
+### Output from Acceptance Testing
+<!--
+Replace TestAccXXX with a pattern that matches the tests affected by this PR.
+
+For more information on the `-run` flag, see the `go test` documentation at https://tip.golang.org/cmd/go/#hdr-Testing_flags.
+-->
+
+```console
+% make testacc TESTS=TestAccXXX
+
+...
+```
diff --git a/.github/workflows/acctest.yaml b/.github/workflows/acctest.yaml
index 77d29c2..b31949c 100644
--- a/.github/workflows/acctest.yaml
+++ b/.github/workflows/acctest.yaml
@@ -1,12 +1,6 @@
 name: Acceptance Tests
 
 on:
-  workflow_run:
-    workflows: 
-      - CI
-    types:
-      - completed
-
   workflow_dispatch:
     inputs: 
       terraform-version:
@@ -20,7 +14,6 @@ jobs:
     name: Acceptance Test
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    environment: acctest
     concurrency: acctest
     steps:
       - uses: actions/checkout@v4
@@ -34,13 +27,13 @@ jobs:
 
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
         with:
-          terraform_version: ${{ inputs.terraform-version || '1.9.*' }}
+          terraform_version: ${{ inputs.terraform-version }}
           terraform_wrapper: false
 
       - run: |
           go test ./... -run=TestAcc -v
         env:
-          DOCKER_USERNAME: dockerterraformprovideracctest
+          DOCKER_USERNAME: "${{ vars.DOCKER_USERNAME }}"
           DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}"
           TF_ACC: "1"
         timeout-minutes: 30