fix

Signed-off-by: laurentsimon <[email protected]>
slsa-framework · Mar 27, 2024 · 66038fd · 66038fd
1 parent d01a816
commit 66038fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/deployment/internal/project/project.go b/pkg/deployment/internal/project/project.go
@@ -32,7 +32,7 @@ type Package struct {
 }
 
 type Protection struct {
-	ServiceAccount string `json:"service_account"`
+	GoogleServiceAccount string `json:"google_service_account"`
 }
 
 // Policy defines the policy.
@@ -91,7 +91,7 @@ func (p *Policy) validateFormat() error {
 }
 
 func (p *Policy) validateProtection() error {
-	if p.Protection.ServiceAccount == "" {
+	if p.Protection.GoogleServiceAccount == "" {
 		return fmt.Errorf("[project] %w: empty protection service_account", errs.ErrorInvalidField)
 	}
 	return nil
@@ -176,7 +176,7 @@ func FromReaders(readers iterator.NamedReadCloserIterator, orgPolicy organizatio
 		policies[id] = *policy
 
 		// The protection must be unique across all projects.
-		name := policy.Protection.ServiceAccount
+		name := policy.Protection.GoogleServiceAccount
 		if _, exists := protections[name]; exists {
 			return nil, fmt.Errorf("[project] %w: protection's serivce_account (%q) is defined more than once", errs.ErrorInvalidField, name)
 		}

diff --git a/pkg/deployment/internal/project/project_test.go b/pkg/deployment/internal/project/project_test.go
@@ -65,7 +65,7 @@ func Test_validateProtection(t *testing.T) {
 			name: "service_account present",
 			policy: Policy{
 				Protection: Protection{
-					ServiceAccount: "the_sa",
+					GoogleServiceAccount: "the_sa",
 				},
 			},
 		},
@@ -462,7 +462,7 @@ func Test_Evaluate(t *testing.T) {
 	}
 	project := Policy{
 		Protection: Protection{
-			ServiceAccount: "protection_name",
+			GoogleServiceAccount: "protection_name",
 		},
 		BuildRequirements: BuildRequirements{
 			RequireSlsaLevel: common.AsPointer(2),
@@ -666,7 +666,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name",
+						GoogleServiceAccount: "protection_name",
 					},
 					Packages: []Package{
 						{
@@ -683,7 +683,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name2",
+						GoogleServiceAccount: "protection_name2",
 					},
 					Packages: []Package{
 						{
@@ -707,7 +707,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name",
+						GoogleServiceAccount: "protection_name",
 					},
 					Packages: []Package{
 						{
@@ -724,7 +724,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name",
+						GoogleServiceAccount: "protection_name",
 					},
 					Packages: []Package{
 						{
@@ -749,7 +749,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name",
+						GoogleServiceAccount: "protection_name",
 					},
 					Packages: []Package{
 						{
@@ -766,7 +766,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name2",
+						GoogleServiceAccount: "protection_name2",
 					},
 					Packages: []Package{
 						{
@@ -791,7 +791,7 @@ func Test_FromReaders(t *testing.T) {
 				{
 					Format: 1,
 					Protection: Protection{
-						ServiceAccount: "protection_name",
+						GoogleServiceAccount: "protection_name",
 					},
 					Packages: []Package{
 						{