Add IngressAttributes to PolicySetVersion (#1108)

* Fetch latest changelog

* Updated changelog

* Updated changelog

* Updated re-use of IngressAttributes struct

* Added upgrade organization subscription call

* Updated ingress attributes test

* Updated ingress attributes nil check

* Fetch latest changelog

* Updated changelog

* Updated changelog

* Updated re-use of IngressAttributes struct

* Added upgrade organization subscription call

* Updated ingress attributes test

* Updated ingress attributes nil check

* Updated changelog

* Rebased "policysetversion/ingress-attributes" onto a local branch

---------

Co-authored-by: jpadrianoGo <[email protected]>

Author: sebasslash

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+## Enhancements
+* Adds `IngressAttributes` field to `PolicySetVersion` by @jpadrianoGo [#1092](https://github.com/hashicorp/go-tfe/pull/1092)
+
 # v1.80.0
 
 ## Enhancements

policy_set_version.go

@@ -69,14 +69,15 @@ type PolicySetVersionStatusTimestamps struct {
 
 // PolicySetVersion represents a Terraform Enterprise Policy Set Version
 type PolicySetVersion struct {
-	ID               string                           `jsonapi:"primary,policy-set-versions"`
-	Source           PolicySetVersionSource           `jsonapi:"attr,source"`
-	Status           PolicySetVersionStatus           `jsonapi:"attr,status"`
-	StatusTimestamps PolicySetVersionStatusTimestamps `jsonapi:"attr,status-timestamps"`
-	Error            string                           `jsonapi:"attr,error"`
-	ErrorMessage     string                           `jsonapi:"attr,error-message"`
-	CreatedAt        time.Time                        `jsonapi:"attr,created-at,iso8601"`
-	UpdatedAt        time.Time                        `jsonapi:"attr,updated-at,iso8601"`
+	ID                string                           `jsonapi:"primary,policy-set-versions"`
+	Source            PolicySetVersionSource           `jsonapi:"attr,source"`
+	Status            PolicySetVersionStatus           `jsonapi:"attr,status"`
+	StatusTimestamps  PolicySetVersionStatusTimestamps `jsonapi:"attr,status-timestamps"`
+	Error             string                           `jsonapi:"attr,error"`
+	ErrorMessage      string                           `jsonapi:"attr,error-message"`
+	CreatedAt         time.Time                        `jsonapi:"attr,created-at,iso8601"`
+	UpdatedAt         time.Time                        `jsonapi:"attr,updated-at,iso8601"`
+	IngressAttributes *IngressAttributes               `jsonapi:"attr,ingress-attributes"`
 
 	// Relations
 	PolicySet *PolicySet `jsonapi:"relation,policy-set"`

policy_set_version_integration_test.go

@@ -5,6 +5,7 @@ package tfe
 
 import (
 	"context"
+	"os"
 	"testing"
 	"time"
 
@@ -139,3 +140,67 @@ func TestPolicySetVersionsUploadURL(t *testing.T) {
 		assert.EqualError(t, err, "the Policy Set Version upload URL is empty")
 	})
 }
+
+func TestPolicySetVersionsIngressAttributes(t *testing.T) {
+	client := testClient(t)
+	ctx := context.Background()
+
+	orgTest, orgTestCleanup := createOrganization(t, client)
+	t.Cleanup(orgTestCleanup)
+
+	upgradeOrganizationSubscription(t, client, orgTest)
+
+	t.Run("with vcs", func(t *testing.T) {
+		githubIdentifier := os.Getenv("GITHUB_POLICY_SET_IDENTIFIER")
+		if githubIdentifier == "" {
+			t.Skip("Export a valid GITHUB_POLICY_SET_IDENTIFIER before running this test")
+		}
+
+		otTest, otTestCleanup := createOAuthToken(t, client, orgTest)
+		t.Cleanup(otTestCleanup)
+
+		options := PolicySetCreateOptions{
+			Name:         String("vcs-policy-set"),
+			Kind:         Sentinel,
+			PoliciesPath: String("policy-sets/foo"),
+			VCSRepo: &VCSRepoOptions{
+				Branch:            String("policies"),
+				Identifier:        String(githubIdentifier),
+				OAuthTokenID:      String(otTest.ID),
+				IngressSubmodules: Bool(true),
+			},
+		}
+
+		ps, err := client.PolicySets.Create(ctx, orgTest.Name, options)
+		require.NoError(t, err)
+
+		ps, err = client.PolicySets.ReadWithOptions(ctx, ps.ID, &PolicySetReadOptions{
+			Include: []PolicySetIncludeOpt{
+				PolicySetNewestVersion,
+			},
+		})
+		require.NoError(t, err)
+
+		psv, err := client.PolicySetVersions.Read(ctx, ps.NewestVersion.ID)
+		require.NoError(t, err)
+
+		require.NotNil(t, psv.IngressAttributes)
+		assert.NotZero(t, psv.IngressAttributes.CommitSHA)
+		assert.NotZero(t, psv.IngressAttributes.CommitURL)
+		assert.NotZero(t, psv.IngressAttributes.Identifier)
+	})
+
+	t.Run("without vcs", func(t *testing.T) {
+		psTest, psTestCleanup := createPolicySet(t, client, nil, nil, nil, nil, nil, "")
+		t.Cleanup(psTestCleanup)
+
+		psv, err := client.PolicySetVersions.Create(ctx, psTest.ID)
+		require.NoError(t, err)
+
+		assert.NotEmpty(t, psv.ID)
+		assert.Equal(t, psv.Source, PolicySetVersionSourceAPI)
+		assert.Equal(t, psv.PolicySet.ID, psTest.ID)
+
+		assert.Nil(t, psv.IngressAttributes)
+	})
+}