fix papi-server conversion and align naming of prebuild settings

gitpod-io · Sep 29, 2023 · 11b6d0c · 11b6d0c
1 parent 8871b18
commit 11b6d0c
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 133 deletions.
diff --git a/components/dashboard/src/service/public-api.ts b/components/dashboard/src/service/public-api.ts
@@ -115,8 +115,8 @@ export function projectToProtocol(project: Project): ProtocolProject {
             },
             prebuilds: {
                 enable: project.settings?.prebuild?.enablePrebuilds,
-                branchStrategy: project.settings?.prebuild?.prebuildBranchStrategy as any,
-                branchMatchingPattern: project.settings?.prebuild?.prebuildBranchPattern,
+                branchStrategy: project.settings?.prebuild?.branchStrategy as any,
+                branchMatchingPattern: project.settings?.prebuild?.branchMatchingPattern,
                 prebuildInterval: project.settings?.prebuild?.prebuildInterval,
                 workspaceClass: project.settings?.prebuild?.workspaceClass,
             },

diff --git a/components/gitpod-protocol/go/gitpod-service.go b/components/gitpod-protocol/go/gitpod-service.go
@@ -2302,7 +2302,7 @@ type PrebuildSettings struct {
 	Enable                *bool   `json:"enable,omitempty"`
 	PrebuildInterval      *int32  `json:"prebuildInterval,omitempty"`
 	BranchStrategy        *string `json:"branchStrategy,omitempty"`
-	PrebuildBranchPattern *string `json:"prebuildBranchPattern,omitempty"`
+	BranchMatchingPattern *string `json:"branchMatchingPattern,omitempty"`
 	WorkspaceClass        *string `json:"workspaceClass,omitempty"`
 }
 

diff --git a/components/public-api-server/pkg/apiv1/project.go b/components/public-api-server/pkg/apiv1/project.go
@@ -180,8 +180,8 @@ func projectSettingsToAPIResponse(s *protocol.ProjectSettings) *v1.ProjectSettin
 	}
 	if s.PrebuildSettings != nil {
 		settings.Prebuild.EnablePrebuilds = s.PrebuildSettings.Enable
-		settings.Prebuild.PrebuildBranchStrategy = s.PrebuildSettings.BranchStrategy
-		settings.Prebuild.PrebuildBranchPattern = s.PrebuildSettings.PrebuildBranchPattern
+		settings.Prebuild.BranchStrategy = s.PrebuildSettings.BranchStrategy
+		settings.Prebuild.BranchMatchingPattern = s.PrebuildSettings.BranchMatchingPattern
 		settings.Prebuild.PrebuildInterval = s.PrebuildSettings.PrebuildInterval
 		settings.Prebuild.WorkspaceClass = s.PrebuildSettings.WorkspaceClass
 	}

diff --git a/components/public-api/gitpod/experimental/v1/projects.proto b/components/public-api/gitpod/experimental/v1/projects.proto
@@ -49,8 +49,8 @@ message PrebuildSettings {
     reserved 4; // was prebuild_every_nth
     optional bool enable_prebuilds = 5;
     reserved 6; // was prebuild_default_branch_only
-    optional string prebuild_branch_pattern = 7;
-    optional string prebuild_branch_strategy = 8;
+    optional string branch_matching_pattern = 7;
+    optional string branch_strategy = 8;
     optional int32 prebuild_interval = 9;
     optional string workspace_class = 10;
 }