add optional arch to update, add arch fields to responses

Author: Kelsi Hoyle

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+## Bug fixes
+
+* Adds `Archs` field to update ToolVersions and includes architecture fields in responses. This provides BETA support, which is EXPERIMENTAL, SUBJECT TO CHANGE, and may not be available to all users by @kelsi-hoyle [#1047](https://github.com/hashicorp/go-tfe/pull/1047)
+
 # v1.75.0
 
 ## Enhancements

admin_terraform_version.go

@@ -49,17 +49,25 @@ type adminTerraformVersions struct {
 
 // AdminTerraformVersion represents a Terraform Version
 type AdminTerraformVersion struct {
-	ID               string    `jsonapi:"primary,terraform-versions"`
-	Version          string    `jsonapi:"attr,version"`
-	URL              string    `jsonapi:"attr,url"`
-	Sha              string    `jsonapi:"attr,sha"`
-	Deprecated       bool      `jsonapi:"attr,deprecated"`
-	DeprecatedReason *string   `jsonapi:"attr,deprecated-reason,omitempty"`
-	Official         bool      `jsonapi:"attr,official"`
-	Enabled          bool      `jsonapi:"attr,enabled"`
-	Beta             bool      `jsonapi:"attr,beta"`
-	Usage            int       `jsonapi:"attr,usage"`
-	CreatedAt        time.Time `jsonapi:"attr,created-at,iso8601"`
+	ID               string                     `jsonapi:"primary,terraform-versions"`
+	Version          string                     `jsonapi:"attr,version"`
+	URL              string                     `jsonapi:"attr,url,omitempty"`
+	Sha              string                     `jsonapi:"attr,sha,omitempty"`
+	Deprecated       bool                       `jsonapi:"attr,deprecated"`
+	DeprecatedReason *string                    `jsonapi:"attr,deprecated-reason,omitempty"`
+	Official         bool                       `jsonapi:"attr,official"`
+	Enabled          bool                       `jsonapi:"attr,enabled"`
+	Beta             bool                       `jsonapi:"attr,beta"`
+	Usage            int                        `jsonapi:"attr,usage"`
+	CreatedAt        time.Time                  `jsonapi:"attr,created-at,iso8601"`
+	Archs            []*ToolVersionArchitecture `jsonapi:"attr,archs,omitempty"`
+}
+
+type ToolVersionArchitecture struct {
+	URL  string `jsonapi:"attr,url"`
+	Sha  string `jsonapi:"attr,sha"`
+	OS   string `jsonapi:"attr,os"`
+	Arch string `jsonapi:"attr,arch"`
 }
 
 type ToolVersionArchitectureOptions struct {
@@ -86,8 +94,8 @@ type AdminTerraformVersionsListOptions struct {
 type AdminTerraformVersionCreateOptions struct {
 	Type             string                            `jsonapi:"primary,terraform-versions"`
 	Version          *string                           `jsonapi:"attr,version"` // Required
-	URL              *string                           `jsonapi:"attr,url"`     // Required
-	Sha              *string                           `jsonapi:"attr,sha"`     // Required
+	URL              *string                           `jsonapi:"attr,url,omitempty"`
+	Sha              *string                           `jsonapi:"attr,sha,omitempty"`
 	Official         *bool                             `jsonapi:"attr,official,omitempty"`
 	Deprecated       *bool                             `jsonapi:"attr,deprecated,omitempty"`
 	DeprecatedReason *string                           `jsonapi:"attr,deprecated-reason,omitempty"`
@@ -99,15 +107,16 @@ type AdminTerraformVersionCreateOptions struct {
 // AdminTerraformVersionUpdateOptions for updating terraform version.
 // https://developer.hashicorp.com/terraform/enterprise/api-docs/admin/terraform-versions#request-body
 type AdminTerraformVersionUpdateOptions struct {
-	Type             string  `jsonapi:"primary,terraform-versions"`
-	Version          *string `jsonapi:"attr,version,omitempty"`
-	URL              *string `jsonapi:"attr,url,omitempty"`
-	Sha              *string `jsonapi:"attr,sha,omitempty"`
-	Official         *bool   `jsonapi:"attr,official,omitempty"`
-	Deprecated       *bool   `jsonapi:"attr,deprecated,omitempty"`
-	DeprecatedReason *string `jsonapi:"attr,deprecated-reason,omitempty"`
-	Enabled          *bool   `jsonapi:"attr,enabled,omitempty"`
-	Beta             *bool   `jsonapi:"attr,beta,omitempty"`
+	Type             string                            `jsonapi:"primary,terraform-versions"`
+	Version          *string                           `jsonapi:"attr,version,omitempty"`
+	URL              *string                           `jsonapi:"attr,url,omitempty"`
+	Sha              *string                           `jsonapi:"attr,sha,omitempty"`
+	Official         *bool                             `jsonapi:"attr,official,omitempty"`
+	Deprecated       *bool                             `jsonapi:"attr,deprecated,omitempty"`
+	DeprecatedReason *string                           `jsonapi:"attr,deprecated-reason,omitempty"`
+	Enabled          *bool                             `jsonapi:"attr,enabled,omitempty"`
+	Beta             *bool                             `jsonapi:"attr,beta,omitempty"`
+	Archs            []*ToolVersionArchitectureOptions `jsonapi:"attr,archs,omitempty"`
 }
 
 // AdminTerraformVersionsList represents a list of terraform versions.

admin_terraform_version_integration_test.go

@@ -137,6 +137,13 @@ func TestAdminTerraformVersions_CreateDelete(t *testing.T) {
 		assert.Equal(t, *opts.DeprecatedReason, *tfv.DeprecatedReason)
 		assert.Equal(t, *opts.Enabled, tfv.Enabled)
 		assert.Equal(t, *opts.Beta, tfv.Beta)
+		assert.Equal(t, len(opts.Archs), len(tfv.Archs))
+		for i, arch := range opts.Archs {
+			assert.Equal(t, arch.URL, tfv.Archs[i].URL)
+			assert.Equal(t, arch.Sha, tfv.Archs[i].Sha)
+			assert.Equal(t, arch.OS, tfv.Archs[i].OS)
+			assert.Equal(t, arch.Arch, tfv.Archs[i].Arch)
+		}
 	})
 
 	t.Run("with valid options, url, and sha", func(t *testing.T) {
@@ -263,6 +270,29 @@ func TestAdminTerraformVersions_ReadUpdate(t *testing.T) {
 		assert.Equal(t, *updateOpts.Deprecated, tfv.Deprecated)
 		assert.Equal(t, *opts.Enabled, tfv.Enabled)
 		assert.Equal(t, *opts.Beta, tfv.Beta)
+
+		// Update using Archs
+		anotherUpdateVersion := genSafeRandomTerraformVersion()
+		updateArchOpts := AdminTerraformVersionUpdateOptions{
+			Version:    String(anotherUpdateVersion),
+			Deprecated: Bool(false),
+			Archs: []*ToolVersionArchitectureOptions{{
+				URL:  "https://www.hashicorp.com",
+				Sha:  *sha,
+				OS:   linux,
+				Arch: amd64,
+			}},
+		}
+
+		tfv, err = client.Admin.TerraformVersions.Update(ctx, id, updateArchOpts)
+		require.NoError(t, err)
+
+		assert.Equal(t, len(tfv.Archs), 1)
+		assert.Equal(t, updateArchOpts.Archs[0].URL, tfv.Archs[0].URL)
+		assert.Equal(t, updateArchOpts.Archs[0].Sha, tfv.Archs[0].Sha)
+		assert.Equal(t, updateArchOpts.Archs[0].OS, tfv.Archs[0].OS)
+		assert.Equal(t, updateArchOpts.Archs[0].Arch, tfv.Archs[0].Arch)
+		assert.Equal(t, anotherUpdateVersion, tfv.Version)
 	})
 
 	t.Run("with non-existent terraform version", func(t *testing.T) {