[TFDN-217] Add Support for Tool Version Architecture Fields #1762

kelsi-hoyle · 2025-06-17T13:50:31Z

Description

At the time of GA for the Arm64 Agent Support project, the TFE Provider will need to support the creation and updating of tool versions with Linux amd64 and Linux arm64 architectures.

The tfe provider calls the Terraform versions API via go-tfe’s AdminTerraformVersionCreateOptions and AdminTerraformVersionUpdateOptions. To support the arm64 Terraform version creation and updates, the Archs field will need to be included in this request.

This change enables adds archs to the tool version resources to be added to the create and update calls and adds them to the read.

tfe_terraform_version, tfe_sentinel_version, and tfe_opa_version use the archs block:

archs [{
    url = "https://releases.hashicorp.com/terraform/..."
    sha = "dd68a600989c122c5e2ca9fd055f071bfbff8fa7047b48349489e4290b62b8c6"
    os = "linux"
    arch = "amd64"
  },
      {
        os = "linux"
        arch = "arm64"
        url = "https://releases.hashicorp.com/terraform/...."
        sha = "dd68a600989c122c5e2ca9fd055f071bfbff8fa7047b48349489e4290b62b8c9"
      }]

Remember to:

Update the Change Log
Update the Documentation

Testing plan

Describe how to replicate
the conditions
under which your code performs its purpose,
including example Terraform configs where necessary.

External links

Include any links here that might be helpful for people reviewing your PR. If there are none, feel free to delete this section.

Output from acceptance tests

Please run applicable acceptance tests locally and include the output here. See testing.md to learn how to run acceptance tests.

If you are an external contributor, your contribution(s) will first be reviewed before running them against the project's CI pipeline.

Rollback Plan

Changes to Security Controls

…rsion

kelsi-hoyle · 2025-06-17T19:17:52Z

One thing that I fond confusing is that if we send only archs, it updates the top level url and sha fields. This looks like they are being deleted in the diff with each change that does not have the url and sha.

@natalie-todd how willTFDN-843 effect this?

natalie-todd · 2025-06-17T19:28:59Z

One thing that I fond confusing is that if we send only archs, it updates the top level url and sha fields. This looks like they are being deleted in the diff with each change that does not have the url and sha.
@natalie-todd how will[TFDN-843](https://hashicorp.atlassian.net/browse/TFDN-843) effect this?

TFDN-843 will make it so the top level url and sha are no longer being set.

natalie-todd · 2025-06-18T15:57:10Z

@kelsi-hoyle do you know what the release schedule is for the provider? We will need to know so we can time this with the TFE release. Let me know if it would be helpful for me to ask about this.

natalie-todd · 2025-06-18T23:00:00Z

internal/provider/resource_tfe_opa_version_test.go

+func testAccCheckTFEOPAVersionAttributesArchs(opaVersion *tfe.AdminOPAVersion, version string, sha string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if opaVersion.Version != version {
+			return fmt.Errorf("Bad version: %s", opaVersion.Version)


I know this is happening in other parts of the repo too, but generally error strings are not capitalized. https://go.dev/wiki/CodeReviewComments#error-strings

internal/provider/resource_tfe_opa_version_test.go

internal/provider/resource_tfe_sentinel_version_test.go

internal/provider/resource_tfe_terraform_version_test.go

…into kelsi-hoyle/TF-24744/arm-toolversion-support

kelsi-hoyle · 2025-09-04T15:22:28Z

internal/provider/resource_tfe_opa_version.go

+			"deprecated_reason": schema.StringAttribute{
+				Optional: true,
+			},
+			"archs": schema.SetNestedAttribute{


new archs functionality

kelsi-hoyle · 2025-09-04T15:25:33Z

internal/provider/resource_tfe_opa_version.go

+					setplanmodifier.UseStateForUnknown(),
+					PreserveAMD64ArchsOnChange(),


UseStateForUnknown is needed to ensure that no refresh plans pass

Since these values can be computed and not always in the config, these plan modifiers are needed to ensure the values on update are correct.

kelsi-hoyle · 2025-09-04T15:26:07Z

internal/provider/resource_tfe_terraform_version.go

 				Optional: true,
-				Default:  nil,
+			},
+			"archs": schema.SetNestedAttribute{


new archs functionality

kelsi-hoyle · 2025-09-04T15:26:34Z

internal/provider/resource_tfe_sentinel_version.go

+			"deprecated_reason": schema.StringAttribute{
+				Optional: true,
+			},
+			"archs": schema.SetNestedAttribute{


new archs functionality

kelsi-hoyle added 21 commits April 16, 2025 16:24

update go-tfe (v w/arm support), add arch opts to create terraform ve…

34abc64

…rsion

add tests and update formatting archs

cc32dbc

use the conversion method

12d6708

remove conversion, create method to set archs or url/sha

4de9d94

merge working branch

39be398

refactor the update/create

08f08ef

clean up code

656be24

add validation to archs & url/sha

3117852

setting from the read update

9fd29ef

lint

7fc8803

set url, sha, and arch to nil if not present

b05b9b3

Merge branch 'main' into kelsi-hoyle/TF-24744/terraform-arm-support

7c6b7fd

Merge branch 'main' into kelsi-hoyle/TF-24744/terraform-arm-support

2079f6c

add helper, add opa versions schema

d083459

archs to opa, tests

2329d63

archs to sentinel, tests

2fbfc19

update testAccCheckTFESentinelVersionAttributeArchs

2e45780

fix variable case

2e3513d

fix variable case

ac0a7c8

update changelog

8aedc7f

update changelog

8dc2594

kelsi-hoyle force-pushed the kelsi-hoyle/TF-24744/arm-toolversion-support branch from cdf0756 to 8dc2594 Compare June 17, 2025 19:12

kelsi-hoyle changed the title ~~Kelsi hoyle/tf 24744/arm toolversion support~~ [TFDN-217] Add Support for Tool Version Architecture Fields Jun 17, 2025

natalie-todd reviewed Jun 18, 2025

View reviewed changes

kelsi-hoyle added the DO NOT MERGE label Jun 19, 2025

kelsi-hoyle marked this pull request as ready for review June 19, 2025 14:00

kelsi-hoyle requested a review from a team as a code owner June 19, 2025 14:00

kelsi-hoyle added 26 commits August 18, 2025 10:37

protocol 6 update

79db9af

lint

aeeef54

update test provider to protocol 6

29f91ca

tests on v6

83a3763

lint

79e57f6

lint

b4c7a2c

add the test server

2338486

use function to convert archs

221313a

remove unused model

7545ddc

computed true on values that arent required

382026e

add default values

a899527

allow null for deprecated"

70469b2

exclude archs from refresh

edc6ee2

exclude id from refresh

8b0ccdd

currently works

a07f685

remove the plan modifier

6cad682

lint

8437fe1

refactor

2e69fbd

Merge remote-tracking branch 'origin/kelsi-hoyle/TF-24744/validator' …

ed51354

…into kelsi-hoyle/TF-24744/arm-toolversion-support

skip updating plan archs if archs are in the config

2b11d94

keep url/sha updated, use config as source of values

098a3f6

update other resources to use the modifiers

7bca552

merge conflicts with main

41cd304

website docs

874ae1f

lint

764e2e4

fix import and update acc tests

fe439d1

kelsi-hoyle requested a review from brandonc September 2, 2025 14:50

kelsi-hoyle added 2 commits September 2, 2025 12:12

remove blank line in changelog

e6625c9

clean up comments

20d5bdc

kelsi-hoyle commented Sep 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[TFDN-217] Add Support for Tool Version Architecture Fields #1762

[TFDN-217] Add Support for Tool Version Architecture Fields #1762

Uh oh!

kelsi-hoyle commented Jun 17, 2025 •

edited

Loading

Uh oh!

kelsi-hoyle commented Jun 17, 2025

Uh oh!

natalie-todd commented Jun 17, 2025

Uh oh!

natalie-todd commented Jun 18, 2025 •

edited

Loading

Uh oh!

natalie-todd Jun 18, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kelsi-hoyle Sep 4, 2025

Uh oh!

kelsi-hoyle Sep 4, 2025

Uh oh!

kelsi-hoyle Sep 4, 2025

Uh oh!

kelsi-hoyle Sep 4, 2025

Uh oh!

Uh oh!

		setplanmodifier.UseStateForUnknown(),
		PreserveAMD64ArchsOnChange(),

[TFDN-217] Add Support for Tool Version Architecture Fields #1762

Are you sure you want to change the base?

[TFDN-217] Add Support for Tool Version Architecture Fields #1762

Uh oh!

Conversation

kelsi-hoyle commented Jun 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing plan

External links

Output from acceptance tests

Rollback Plan

Changes to Security Controls

Uh oh!

kelsi-hoyle commented Jun 17, 2025

Uh oh!

natalie-todd commented Jun 17, 2025

Uh oh!

natalie-todd commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

natalie-todd Jun 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kelsi-hoyle Sep 4, 2025

Choose a reason for hiding this comment

Uh oh!

kelsi-hoyle Sep 4, 2025

Choose a reason for hiding this comment

Uh oh!

kelsi-hoyle Sep 4, 2025

Choose a reason for hiding this comment

Uh oh!

kelsi-hoyle Sep 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kelsi-hoyle commented Jun 17, 2025 •

edited

Loading

natalie-todd commented Jun 18, 2025 •

edited

Loading