From 16ed98c88a26e2208764b019c16a4b2bef12f358 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 2 Jan 2024 15:06:48 -0800 Subject: [PATCH 01/20] remove old scripts and add submodule for upload scripts --- .github/workflows/test.yml | 14 +++-- .gitmodules | 3 + scripts/add_to_xml_test_report.py | 68 --------------------- scripts/test_report_upload_script.py | 90 ---------------------------- test_scripts | 1 + 5 files changed, 14 insertions(+), 162 deletions(-) create mode 100644 .gitmodules delete mode 100644 scripts/add_to_xml_test_report.py delete mode 100644 scripts/test_report_upload_script.py create mode 160000 test_scripts diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90b88176d..2ddba0495 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,8 +13,14 @@ jobs: env: EXIT_STATUS: 0 steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 + - name: Clone Repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: 'recursive' + + - name: Set up Go + uses: actions/setup-go@v5 with: go-version: 'stable' - run: go version @@ -64,7 +70,7 @@ jobs: if: github.ref == 'refs/heads/main' && github.event_name == 'push' run: | filename=$(ls | grep -E '^[0-9]{12}_linodego_test_report\.xml$') - python scripts/add_to_xml_test_report.py \ + python test_scripts/add_to_xml_test_report.py \ --branch_name "${GITHUB_REF#refs/*/}" \ --gha_run_id "$GITHUB_RUN_ID" \ --gha_run_number "$GITHUB_RUN_NUMBER" \ @@ -77,7 +83,7 @@ jobs: LINODE_CLI_OBJ_SECRET_KEY: ${{ secrets.LINODE_CLI_OBJ_SECRET_KEY }} run: | report_filename=$(ls | grep -E '^[0-9]{12}_linodego_test_report\.xml$') - python3 scripts/test_report_upload_script.py "${report_filename}" + python3 test_scripts/test_report_upload_script.py "${report_filename}" - name: Test Execution Status Handler run: | diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..de4d3c4f8 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "test_scripts"] + path = test_scripts + url = https://github.com/linode/TOD-test-report-uploader.git diff --git a/scripts/add_to_xml_test_report.py b/scripts/add_to_xml_test_report.py deleted file mode 100644 index 60b105993..000000000 --- a/scripts/add_to_xml_test_report.py +++ /dev/null @@ -1,68 +0,0 @@ -import argparse -import xml.etree.ElementTree as ET -import requests - -latest_release_url = "https://api.github.com/repos/linode/linodego/releases/latest" - - -def get_release_version(): - url = latest_release_url - - try: - response = requests.get(url) - response.raise_for_status() # Check for HTTP errors - - release_info = response.json() - version = release_info["tag_name"] - - # Remove 'v' prefix if it exists - if version.startswith("v"): - version = version[1:] - - return str(version) - - except requests.exceptions.RequestException as e: - print("Error:", e) - except KeyError: - print("Error: Unable to fetch release information from GitHub API.") - - -# Parse command-line arguments -parser = argparse.ArgumentParser(description='Modify XML with workflow information') -parser.add_argument('--branch_name', required=True) -parser.add_argument('--gha_run_id', required=True) -parser.add_argument('--gha_run_number', required=True) -parser.add_argument('--release_tag', required=False) -parser.add_argument('--xmlfile', required=True) # Added argument for XML file path - -args = parser.parse_args() - -# Open and parse the XML file -xml_file_path = args.xmlfile -tree = ET.parse(xml_file_path) -root = tree.getroot() - -# Create new elements for the information -branch_name_element = ET.Element('branch_name') -branch_name_element.text = args.branch_name - -gha_run_id_element = ET.Element('gha_run_id') -gha_run_id_element.text = args.gha_run_id - -gha_run_number_element = ET.Element('gha_run_number') -gha_run_number_element.text = args.gha_run_number - -gha_release_tag_element = ET.Element('release_tag') -gha_release_tag_element.text = get_release_version() - -# Add the new elements to the root of the XML -root.append(branch_name_element) -root.append(gha_run_id_element) -root.append(gha_run_number_element) -root.append(gha_release_tag_element) - -# Save the modified XML -modified_xml_file_path = xml_file_path # Overwrite it -tree.write(modified_xml_file_path) - -print(f'Modified XML saved to {modified_xml_file_path}') diff --git a/scripts/test_report_upload_script.py b/scripts/test_report_upload_script.py deleted file mode 100644 index 4365561e1..000000000 --- a/scripts/test_report_upload_script.py +++ /dev/null @@ -1,90 +0,0 @@ -import boto3 -import sys -import os -import xml.etree.ElementTree as ET -from botocore.exceptions import NoCredentialsError - -ACCESS_KEY = os.environ.get('LINODE_CLI_OBJ_ACCESS_KEY') -SECRET_KEY = os.environ.get('LINODE_CLI_OBJ_SECRET_KEY') -BUCKET_NAME = 'dx-test-results' - -linode_obj_config = { - "aws_access_key_id": ACCESS_KEY, - "aws_secret_access_key": SECRET_KEY, - "endpoint_url": "https://us-southeast-1.linodeobjects.com", - "region_name": "us-southeast-1", -} - -def change_xml_report_to_tod_acceptable_version(file_name): - # Load the original XML file - tree = ET.parse(file_name) - root = tree.getroot() - - testsuites_element = root - - # total - total_tests = int(testsuites_element.get('tests')) if testsuites_element.get('tests') is not None else 0 - total_failures = int(testsuites_element.get('failures')) if testsuites_element.get('failures') is not None else 0 - total_errors = int(testsuites_element.get('errors')) if testsuites_element.get('errors') is not None else 0 - total_skipped = int(testsuites_element.get('skipped')) if testsuites_element.get('skipped') is not None else 0 - - # Create a new element with aggregated values - new_testsuites = ET.Element("testsuites") - new_testsuites.set("tests", str(total_tests)) - new_testsuites.set("failures", str(total_failures)) - new_testsuites.set("errors", str(total_errors)) - new_testsuites.set("skipped", str(total_skipped)) - - # Create a new element under - new_testsuite = ET.SubElement(new_testsuites, "testsuite", attrib=testsuites_element.attrib) - - for testcase in root.findall('.//testcase'): - new_testcase = ET.SubElement(new_testsuite, "testcase", attrib=testcase.attrib) - for child in testcase: - new_testcase.append(child) - - branch_name = ET.SubElement(new_testsuite, branch_name) - branch_name.text = root.find('branch_name').text - gha_run_id = ET.SubElement(new_testsuite, gha_run_id) - gha_run_id.text = root.find('gha_run_id').text - gha_run_number = ET.SubElement(new_testsuite, gha_run_number) - gha_run_number.text = root.find('gha_run_number').text - release_tag = ET.SubElement(new_testsuite, release_tag) - release_tag.text = root.find('release_tag').text - - # Save the new XML to a file - try: - new_tree = ET.ElementTree(new_testsuites) - - new_tree.write(file_name, encoding="UTF-8", xml_declaration=True) - - print("XML content successfully over-written to " + file_name) - - except Exception as e: - print("Error writing XML content:", str(e)) - -def upload_to_linode_object_storage(file_name): - try: - s3 = boto3.client('s3', **linode_obj_config) - - s3.upload_file(Filename=file_name, Bucket=BUCKET_NAME, Key=file_name) - - print(f'Successfully uploaded {file_name} to Linode Object Storage.') - - except NoCredentialsError: - print('Credentials not available. Ensure you have set your AWS credentials.') - - -if __name__ == '__main__': - if len(sys.argv) != 2: - print('Usage: python upload_to_linode.py ') - sys.exit(1) - - file_name = sys.argv[1] - - if not file_name: - print('Error: The provided file name is empty or invalid.') - sys.exit(1) - - change_xml_report_to_tod_acceptable_version(file_name) - upload_to_linode_object_storage(file_name) \ No newline at end of file diff --git a/test_scripts b/test_scripts new file mode 160000 index 000000000..83cc8ee20 --- /dev/null +++ b/test_scripts @@ -0,0 +1 @@ +Subproject commit 83cc8ee2081701686ce3e7cb9b970c168889f3c5 From e3620958f4bde413a7a9c17a998105b67843cc11 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 10:03:46 -0700 Subject: [PATCH 02/20] add cross repo testing workflow --- .github/workflows/release-cross-repo-test.yml | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/release-cross-repo-test.yml diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml new file mode 100644 index 000000000..e3748d77a --- /dev/null +++ b/.github/workflows/release-cross-repo-test.yml @@ -0,0 +1,47 @@ +name: Release Terraform cross repository test + +on: + workflow_dispatch: # Manual trigger + +jobs: + terraform_integration_test: + runs-on: ubuntu-latest + steps: + - name: Checkout linodego repository + uses: actions/checkout@v4 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: 'stable' + - run: go version + + - name: Update system packages + run: sudo apt-get update -y + + - name: Install system deps + run: sudo apt-get install -y build-essential + + - name: checkout repo + uses: actions/checkout@v4 + with: + repository: linode/terraform-provider-linode + path: .linode/terraform-provider-linode + + - name: Install linodego from source + run: | + curr_dir=$(pwd) + cd .linode/terraform-provider-linode + go mod edit -replace=github.com/linode/linodego=$curr_dir + + - name: install dependencies + run: | + cd .linode/terraform-provider-linode + make deps + + - name: run tests + run: | + cd .linode/terraform-provider-linode + make int-test + env: + LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From e3959769980be864e499febfac2ab24d4ba253f9 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 10:19:46 -0700 Subject: [PATCH 03/20] delete old submodule dir --- test_scripts | 1 - 1 file changed, 1 deletion(-) delete mode 160000 test_scripts diff --git a/test_scripts b/test_scripts deleted file mode 160000 index 83cc8ee20..000000000 --- a/test_scripts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 83cc8ee2081701686ce3e7cb9b970c168889f3c5 From 2d4ad799ee3e7fdebaf2e48afe2ea838a6d7e694 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 10:35:42 -0700 Subject: [PATCH 04/20] change orders --- .github/workflows/release-cross-repo-test.yml | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index e3748d77a..5115ac6ae 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -10,11 +10,20 @@ jobs: - name: Checkout linodego repository uses: actions/checkout@v4 + - name: checkout repo + uses: actions/checkout@v4 + with: + repository: linode/terraform-provider-linode + path: .linode/terraform-provider-linode + - name: Set up Go uses: actions/setup-go@v5 with: go-version: 'stable' - run: go version + - run: | + cd .linode/terraform-provider-linode + make deps - name: Update system packages run: sudo apt-get update -y @@ -22,23 +31,12 @@ jobs: - name: Install system deps run: sudo apt-get install -y build-essential - - name: checkout repo - uses: actions/checkout@v4 - with: - repository: linode/terraform-provider-linode - path: .linode/terraform-provider-linode - - name: Install linodego from source run: | curr_dir=$(pwd) cd .linode/terraform-provider-linode go mod edit -replace=github.com/linode/linodego=$curr_dir - - name: install dependencies - run: | - cd .linode/terraform-provider-linode - make deps - - name: run tests run: | cd .linode/terraform-provider-linode From ecd67128e985c280de3ad7bc04ac069d2453455b Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 10:38:55 -0700 Subject: [PATCH 05/20] remove make deps --- .github/workflows/release-cross-repo-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 5115ac6ae..9139e1a94 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -21,9 +21,6 @@ jobs: with: go-version: 'stable' - run: go version - - run: | - cd .linode/terraform-provider-linode - make deps - name: Update system packages run: sudo apt-get update -y From 6e806bf66963feaf69541155c362e527437a2456 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 10:55:25 -0700 Subject: [PATCH 06/20] make dep change to command --- .github/workflows/release-cross-repo-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 9139e1a94..8b6eb55d4 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -21,6 +21,9 @@ jobs: with: go-version: 'stable' - run: go version + - run: | + cd .linode/terraform-provider-linode + go generate -tags tools ./tools/tools.go - name: Update system packages run: sudo apt-get update -y From 349512b4db6497c141bc4303136e2971936b7990 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:14:18 -0700 Subject: [PATCH 07/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 8b6eb55d4..19e04e1a5 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -7,14 +7,13 @@ jobs: terraform_integration_test: runs-on: ubuntu-latest steps: - - name: Checkout linodego repository - uses: actions/checkout@v4 +# - name: Checkout linodego repository +# uses: actions/checkout@v4 - name: checkout repo uses: actions/checkout@v4 with: repository: linode/terraform-provider-linode - path: .linode/terraform-provider-linode - name: Set up Go uses: actions/setup-go@v5 @@ -23,7 +22,7 @@ jobs: - run: go version - run: | cd .linode/terraform-provider-linode - go generate -tags tools ./tools/tools.go + make deps - name: Update system packages run: sudo apt-get update -y @@ -31,11 +30,11 @@ jobs: - name: Install system deps run: sudo apt-get install -y build-essential - - name: Install linodego from source - run: | - curr_dir=$(pwd) - cd .linode/terraform-provider-linode - go mod edit -replace=github.com/linode/linodego=$curr_dir +# - name: Install linodego from source +# run: | +# curr_dir=$(pwd) +# cd .linode/terraform-provider-linode +# go mod edit -replace=github.com/linode/linodego=$curr_dir - name: run tests run: | From 90f49e01c299141e41440410d0e1e02bf0606341 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:15:43 -0700 Subject: [PATCH 08/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 19e04e1a5..0a7a69df2 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -21,7 +21,7 @@ jobs: go-version: 'stable' - run: go version - run: | - cd .linode/terraform-provider-linode +# cd .linode/terraform-provider-linode make deps - name: Update system packages @@ -38,7 +38,7 @@ jobs: - name: run tests run: | - cd .linode/terraform-provider-linode +# cd .linode/terraform-provider-linode make int-test env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From a651c6befda4086110252f11d58e28ce2b52c75b Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:18:07 -0700 Subject: [PATCH 09/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 0a7a69df2..5115ac6ae 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -7,13 +7,14 @@ jobs: terraform_integration_test: runs-on: ubuntu-latest steps: -# - name: Checkout linodego repository -# uses: actions/checkout@v4 + - name: Checkout linodego repository + uses: actions/checkout@v4 - name: checkout repo uses: actions/checkout@v4 with: repository: linode/terraform-provider-linode + path: .linode/terraform-provider-linode - name: Set up Go uses: actions/setup-go@v5 @@ -21,7 +22,7 @@ jobs: go-version: 'stable' - run: go version - run: | -# cd .linode/terraform-provider-linode + cd .linode/terraform-provider-linode make deps - name: Update system packages @@ -30,15 +31,15 @@ jobs: - name: Install system deps run: sudo apt-get install -y build-essential -# - name: Install linodego from source -# run: | -# curr_dir=$(pwd) -# cd .linode/terraform-provider-linode -# go mod edit -replace=github.com/linode/linodego=$curr_dir + - name: Install linodego from source + run: | + curr_dir=$(pwd) + cd .linode/terraform-provider-linode + go mod edit -replace=github.com/linode/linodego=$curr_dir - name: run tests run: | -# cd .linode/terraform-provider-linode + cd .linode/terraform-provider-linode make int-test env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From 102ce9b9d97373dbf6ed1a235206e9d1dba4ddc8 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:25:47 -0700 Subject: [PATCH 10/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 5115ac6ae..06488c475 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -23,6 +23,7 @@ jobs: - run: go version - run: | cd .linode/terraform-provider-linode + go mod tidy make deps - name: Update system packages From e217500141a18aa6d6abe72d0953d24da0aa6c61 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:28:23 -0700 Subject: [PATCH 11/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 06488c475..27ece5bcb 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -23,8 +23,10 @@ jobs: - run: go version - run: | cd .linode/terraform-provider-linode - go mod tidy - make deps + go install github.com/bflad/tfproviderlint/cmd/tfproviderlint@latest + go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + go install golang.org/x/tools/cmd/goimports@latest + go install mvdan.cc/gofumpt@latest - name: Update system packages run: sudo apt-get update -y From 02a6b1acd276ae75bbfc324eb3d046d275e1c6c5 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 11:45:42 -0700 Subject: [PATCH 12/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 27ece5bcb..4ff787d60 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -43,6 +43,9 @@ jobs: - name: run tests run: | cd .linode/terraform-provider-linode - make int-test + TF_ACC=1 \ + LINODE_API_VERSION="v4beta" \ + RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ + go test --tags=integration -v ./linode/... -count 1 -timeout 240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From 247ebed3fda2a87eb416de4e0abe783b19f1b757 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 12:06:01 -0700 Subject: [PATCH 13/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 4ff787d60..2b3589fb2 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -43,9 +43,10 @@ jobs: - name: run tests run: | cd .linode/terraform-provider-linode + ls -lah TF_ACC=1 \ LINODE_API_VERSION="v4beta" \ - RUN_LONG_TESTS=$(RUN_LONG_TESTS) \ - go test --tags=integration -v ./linode/... -count 1 -timeout 240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" + RUN_LONG_TESTS="false"\ + go test --tags=integration -v ./linode/ -count 1 -timeout 240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From 5da155d44d1f81f78a59fce029ffefced702e92c Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 12:11:45 -0700 Subject: [PATCH 14/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 2b3589fb2..db34800f6 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -43,10 +43,10 @@ jobs: - name: run tests run: | cd .linode/terraform-provider-linode - ls -lah TF_ACC=1 \ LINODE_API_VERSION="v4beta" \ - RUN_LONG_TESTS="false"\ - go test --tags=integration -v ./linode/ -count 1 -timeout 240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" + RUN_LONG_TESTS="false" \ + go test --tags=integration -v ./linode/ -count=1 -timeout=240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" + env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From 2329f3c8d57097b3f65c3f9a1893622128bd1dda Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 12:42:49 -0700 Subject: [PATCH 15/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index db34800f6..36054c37f 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -10,7 +10,7 @@ jobs: - name: Checkout linodego repository uses: actions/checkout@v4 - - name: checkout repo + - name: checkout terraform repo uses: actions/checkout@v4 with: repository: linode/terraform-provider-linode @@ -22,11 +22,17 @@ jobs: go-version: 'stable' - run: go version - run: | + go install github.com/bflad/tfproviderlint/cmd/tfproviderlint + go install github.com/golangci/golangci-lint/cmd/golangci-lint + go install mvdan.cc/gofumpt + + curr_dir=$(pwd) + pwd cd .linode/terraform-provider-linode - go install github.com/bflad/tfproviderlint/cmd/tfproviderlint@latest - go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest - go install golang.org/x/tools/cmd/goimports@latest - go install mvdan.cc/gofumpt@latest + go mod edit -replace=github.com/linode/linodego=$curr_dir + + cd tools && go mod tidy + go mod tidy - name: Update system packages run: sudo apt-get update -y @@ -34,12 +40,6 @@ jobs: - name: Install system deps run: sudo apt-get install -y build-essential - - name: Install linodego from source - run: | - curr_dir=$(pwd) - cd .linode/terraform-provider-linode - go mod edit -replace=github.com/linode/linodego=$curr_dir - - name: run tests run: | cd .linode/terraform-provider-linode From d1064067b9aab35cbbb34ed9ff65b3fb0ce54a3b Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 12:47:05 -0700 Subject: [PATCH 16/20] gha test.. --- .github/workflows/release-cross-repo-test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 36054c37f..468cbd4ac 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -21,11 +21,7 @@ jobs: with: go-version: 'stable' - run: go version - - run: | - go install github.com/bflad/tfproviderlint/cmd/tfproviderlint - go install github.com/golangci/golangci-lint/cmd/golangci-lint - go install mvdan.cc/gofumpt - + - run: | curr_dir=$(pwd) pwd cd .linode/terraform-provider-linode From 086b9678a059463cb1372d1e2cf5fed567cf211e Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 13:19:13 -0700 Subject: [PATCH 17/20] taking a different approach --- .github/workflows/release-cross-repo-test.yml | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 468cbd4ac..9af821869 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -7,28 +7,28 @@ jobs: terraform_integration_test: runs-on: ubuntu-latest steps: - - name: Checkout linodego repository - uses: actions/checkout@v4 - - name: checkout terraform repo uses: actions/checkout@v4 with: repository: linode/terraform-provider-linode - path: .linode/terraform-provider-linode - name: Set up Go uses: actions/setup-go@v5 with: go-version: 'stable' - run: go version - - run: | - curr_dir=$(pwd) - pwd - cd .linode/terraform-provider-linode - go mod edit -replace=github.com/linode/linodego=$curr_dir - - cd tools && go mod tidy - go mod tidy + - run: make deps + + - name: Clone Repository + uses: actions/checkout@v4 + with: + path: linodego + + - name: Set up linodego + run: | + cd linodego + linodego_dir=$(pwd) + go mod edit -replace github.com/linode/linodego=$linodego_dir - name: Update system packages run: sudo apt-get update -y @@ -38,11 +38,6 @@ jobs: - name: run tests run: | - cd .linode/terraform-provider-linode - TF_ACC=1 \ - LINODE_API_VERSION="v4beta" \ - RUN_LONG_TESTS="false" \ - go test --tags=integration -v ./linode/ -count=1 -timeout=240m -parallel=10 -ldflags="-X=github.com/linode/terraform-provider-linode/v2/version.ProviderVersion=acc" - + make int-test env: LINODE_TOKEN: ${{ secrets.DX_LINODE_TOKEN }} From 8ef40601eba472d8a7cd9bc016206960d3e61312 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 13:38:18 -0700 Subject: [PATCH 18/20] go mod tidy --- .github/workflows/release-cross-repo-test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 9af821869..1ac3821c4 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -28,7 +28,11 @@ jobs: run: | cd linodego linodego_dir=$(pwd) + cd .. + pwd + echo $linodego_dir go mod edit -replace github.com/linode/linodego=$linodego_dir + go mod tidy - name: Update system packages run: sudo apt-get update -y From 75a47e93801bb0140bcf869a6751d223394aa4b4 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 13:42:31 -0700 Subject: [PATCH 19/20] test --- .github/workflows/release-cross-repo-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index 1ac3821c4..af2fbc815 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -27,6 +27,7 @@ jobs: - name: Set up linodego run: | cd linodego + ls -ltrh linodego_dir=$(pwd) cd .. pwd From d04c16c308055eefe82265ee57c699412e15c937 Mon Sep 17 00:00:00 2001 From: ykim-1 Date: Tue, 12 Mar 2024 13:46:34 -0700 Subject: [PATCH 20/20] final clean up --- .github/workflows/release-cross-repo-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release-cross-repo-test.yml b/.github/workflows/release-cross-repo-test.yml index af2fbc815..07356bfe3 100644 --- a/.github/workflows/release-cross-repo-test.yml +++ b/.github/workflows/release-cross-repo-test.yml @@ -27,11 +27,8 @@ jobs: - name: Set up linodego run: | cd linodego - ls -ltrh linodego_dir=$(pwd) cd .. - pwd - echo $linodego_dir go mod edit -replace github.com/linode/linodego=$linodego_dir go mod tidy