diff --git a/Makefile b/Makefile index fc6a4a04144c5..30b6f4798d70e 100644 --- a/Makefile +++ b/Makefile @@ -542,6 +542,9 @@ start-local: mod-vendor-local dep-ui-local cli-local run: bash ./hack/goreman-start.sh +.PHONY: cf-release +cf-release: + go run ./hack/release # Runs pre-commit validation with the virtualized toolchain .PHONY: pre-commit diff --git a/acr_controller/controller/controller.go b/acr_controller/controller/controller.go index dc08173cdd0a9..b880b94f01243 100644 --- a/acr_controller/controller/controller.go +++ b/acr_controller/controller/controller.go @@ -24,10 +24,9 @@ type ACRController interface { type applicationChangeRevisionController struct { appBroadcaster Broadcaster acrService service.ACRService - useAnnotations bool } -func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, applicationServiceClient appclient.ApplicationClient, applicationClientset appclientset.Interface, useAnnotations bool) ACRController { +func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInformer, applicationServiceClient appclient.ApplicationClient, applicationClientset appclientset.Interface) ACRController { appBroadcaster := NewBroadcaster() _, err := appInformer.AddEventHandler(appBroadcaster) if err != nil { @@ -36,7 +35,6 @@ func NewApplicationChangeRevisionController(appInformer cache.SharedIndexInforme return &applicationChangeRevisionController{ appBroadcaster: appBroadcaster, acrService: service.NewACRService(applicationClientset, applicationServiceClient), - useAnnotations: useAnnotations, } } @@ -48,7 +46,7 @@ func (c *applicationChangeRevisionController) Run(ctx context.Context) { return nil // ignore this event } - return c.acrService.ChangeRevision(ctx, &a, c.useAnnotations) + return c.acrService.ChangeRevision(ctx, &a) } // TODO: move to abstraction diff --git a/acr_controller/server.go b/acr_controller/server.go index 59fe446d2f8b6..12bfc9bd8739d 100644 --- a/acr_controller/server.go +++ b/acr_controller/server.go @@ -97,7 +97,7 @@ func (a *ACRServer) Init(ctx context.Context) { } func (a *ACRServer) RunController(ctx context.Context) { - controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.ApplicationServiceClient, a.applicationClientset, !a.DisableAnnotations) + controller := acr_controller.NewApplicationChangeRevisionController(a.appInformer, a.ApplicationServiceClient, a.applicationClientset) go controller.Run(ctx) } diff --git a/acr_controller/service/acr_service.go b/acr_controller/service/acr_service.go index 5eb2f13fe58ce..052a8a0f97b46 100644 --- a/acr_controller/service/acr_service.go +++ b/acr_controller/service/acr_service.go @@ -3,7 +3,6 @@ package service import ( "context" "encoding/json" - "fmt" "sync" log "github.com/sirupsen/logrus" @@ -25,7 +24,7 @@ const ( ) type ACRService interface { - ChangeRevision(ctx context.Context, application *application.Application, useAnnotations bool) error + ChangeRevision(ctx context.Context, application *application.Application) error } type acrService struct { @@ -63,7 +62,7 @@ func getChangeRevision(app *application.Application) string { return "" } -func (c *acrService) ChangeRevision(ctx context.Context, a *application.Application, useAnnotations bool) error { +func (c *acrService) ChangeRevision(ctx context.Context, a *application.Application) error { c.lock.Lock() defer c.lock.Unlock() @@ -81,108 +80,36 @@ func (c *acrService) ChangeRevision(ctx context.Context, a *application.Applicat return nil } - currentRevision, previousRevision := c.getRevisions(ctx, a) - if currentRevision == "" { - c.logger.Infof("Got empty current revision for application %s, is it an unsupported multisource or helm repo based application?", app.Name) - return nil - } - revision, err := c.calculateRevision(ctx, app, currentRevision, previousRevision) + revision, err := c.calculateRevision(ctx, app) if err != nil { return err } - var revisions []string if revision == nil || *revision == "" { c.logger.Infof("Revision for application %s is empty", app.Name) - } else { - c.logger.Infof("Change revision for application %s is %s", app.Name, *revision) - revisions = []string{*revision} + return nil } + c.logger.Infof("Change revision for application %s is %s", app.Name, *revision) + app, err = c.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(ctx, app.Name, metav1.GetOptions{}) if err != nil { return err } - patchMap := make(map[string]any, 2) - - if len(revisions) > 0 { - if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil { - c.logger.Infof("Patch operation status for application %s", app.Name) - patchMap = c.patchOperationSyncResultWithChangeRevision(revisions) - } else { - c.logger.Infof("Patch operation for application %s", app.Name) - patchMap = c.patchOperationWithChangeRevision(revisions) - } - } - if useAnnotations { - err = c.addAnnotationPatch(patchMap, app, *revision, revisions, currentRevision, []string{currentRevision}) - if err != nil { - return err - } - } - if len(patchMap) > 0 { - c.logger.Infof("Patching resource: %v", patchMap) - patch, err := json.Marshal(patchMap) - if err != nil { - return err - } - _, err = c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) - return err - } - c.logger.Infof("No patch needed") - return nil -} - -func addPatchIfNeeded(annotations map[string]string, currentAnnotations map[string]string, key string, val string) { - currentVal, ok := currentAnnotations[key] - if !ok || currentVal != val { - annotations[key] = val - } -} - -func (c *acrService) addAnnotationPatch(m map[string]any, - a *application.Application, - changeRevision string, - changeRevisions []string, - gitRevision string, - gitRevisions []string, -) error { - c.logger.Infof("annotating application '%s', changeRevision=%s, changeRevisions=%v, gitRevision=%s, gitRevisions=%v", a.Name, changeRevision, changeRevisions, gitRevision, gitRevisions) - annotations := map[string]string{} - currentAnnotations := a.Annotations + revisions := []string{*revision} - if changeRevision != "" { - addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISION_ANN, changeRevision) - } - if len(changeRevisions) > 0 { - changeRevisionsJSON, err := json.Marshal(changeRevisions) - if err != nil { - return fmt.Errorf("failed to marshall changeRevisions %v: %w", changeRevisions, err) - } - addPatchIfNeeded(annotations, currentAnnotations, CHANGE_REVISIONS_ANN, string(changeRevisionsJSON)) - } - if gitRevision != "" { - addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISION_ANN, gitRevision) - } - if len(gitRevisions) > 0 { - gitRevisionsJSON, err := json.Marshal(gitRevisions) - if err != nil { - return fmt.Errorf("failed to marshall gitRevisions %v: %w", gitRevisions, err) - } - addPatchIfNeeded(annotations, currentAnnotations, GIT_REVISIONS_ANN, string(gitRevisionsJSON)) + if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil { + c.logger.Infof("Patch operation status for application %s", app.Name) + return c.patchOperationSyncResultWithChangeRevision(ctx, app, revisions) } - if len(annotations) == 0 { - c.logger.Info("no need to add annotations") - } else { - c.logger.Infof("added annotations to application %s patch: %v", a.Name, annotations) - m["metadata"] = map[string]any{"annotations": annotations} - } - return nil + c.logger.Infof("Patch operation for application %s", app.Name) + return c.patchOperationWithChangeRevision(ctx, app, revisions) } -func (c *acrService) calculateRevision(ctx context.Context, a *application.Application, currentRevision string, previousRevision string) (*string, error) { +func (c *acrService) calculateRevision(ctx context.Context, a *application.Application) (*string, error) { + currentRevision, previousRevision := c.getRevisions(ctx, a) c.logger.Infof("Calculate revision for application '%s', current revision '%s', previous revision '%s'", a.Name, currentRevision, previousRevision) changeRevisionResult, err := c.applicationServiceClient.GetChangeRevision(ctx, &appclient.ChangeRevisionRequest{ AppName: ptr.To(a.GetName()), @@ -196,28 +123,33 @@ func (c *acrService) calculateRevision(ctx context.Context, a *application.Appli return changeRevisionResult.Revision, nil } -func (c *acrService) patchOperationWithChangeRevision(revisions []string) map[string]any { +func (c *acrService) patchOperationWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) error { if len(revisions) == 1 { - return map[string]any{ + patch, _ := json.Marshal(map[string]any{ "operation": map[string]any{ "sync": map[string]any{ "changeRevision": revisions[0], }, }, - } + }) + _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) + return err } - return map[string]any{ + + patch, _ := json.Marshal(map[string]any{ "operation": map[string]any{ "sync": map[string]any{ "changeRevisions": revisions, }, }, - } + }) + _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) + return err } -func (c *acrService) patchOperationSyncResultWithChangeRevision(revisions []string) map[string]any { +func (c *acrService) patchOperationSyncResultWithChangeRevision(ctx context.Context, a *application.Application, revisions []string) error { if len(revisions) == 1 { - return map[string]any{ + patch, _ := json.Marshal(map[string]any{ "status": map[string]any{ "operationState": map[string]any{ "operation": map[string]any{ @@ -227,9 +159,12 @@ func (c *acrService) patchOperationSyncResultWithChangeRevision(revisions []stri }, }, }, - } + }) + _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) + return err } - return map[string]any{ + + patch, _ := json.Marshal(map[string]any{ "status": map[string]any{ "operationState": map[string]any{ "operation": map[string]any{ @@ -239,7 +174,9 @@ func (c *acrService) patchOperationSyncResultWithChangeRevision(revisions []stri }, }, }, - } + }) + _, err := c.applicationClientset.ArgoprojV1alpha1().Applications(a.Namespace).Patch(ctx, a.Name, types.MergePatchType, patch, metav1.PatchOptions{}) + return err } func getCurrentRevisionFromOperation(a *application.Application) string { diff --git a/acr_controller/service/acr_service_test.go b/acr_controller/service/acr_service_test.go index e7d3b67f00333..f1a451a89f995 100644 --- a/acr_controller/service/acr_service_test.go +++ b/acr_controller/service/acr_service_test.go @@ -38,26 +38,6 @@ spec: server: https://cluster-api.example.com ` -const multisourceApp = ` -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - annotations: - argocd.argoproj.io/manifest-generate-paths: . - name: guestbook - namespace: codefresh -spec: - sources: - - path: some/path - repoURL: https://github.com/argoproj/argocd-example-apps.git - targetRevision: HEAD - ksonnet: - environment: default - destination: - namespace: ` + test.FakeDestNamespace + ` - server: https://cluster-api.example.com -` - const fakeAppWithOperation = ` apiVersion: argoproj.io/v1alpha1 kind: Application @@ -286,85 +266,53 @@ func Test_getRevisions(r *testing.T) { } func Test_ChangeRevision(r *testing.T) { - newChangeRevision := "new-revision" - gitRevision := "c732f4d2ef24c7eeb900e9211ff98f90bb646505" - useAnnotations := true - appSrc := syncedAppWithHistory + r.Run("Change revision", func(t *testing.T) { + client := &mocks.ApplicationClient{} + client.On("GetChangeRevision", mock.Anything, mock.Anything).Return(&appclient.ChangeRevisionResponse{ + Revision: ptr.To("new-revision"), + }, nil) + acrService := newTestACRService(client) + app := createTestApp(syncedAppWithHistory) + + err := acrService.ChangeRevision(r.Context(), app) + require.NoError(t, err) + + app, err = acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) + require.NoError(t, err) + + assert.Equal(t, "new-revision", app.Status.OperationState.Operation.Sync.ChangeRevision) + }) - testNewChangeRevision := func(t *testing.T) (*acrService, *test2.Hook, *appsv1.Application) { - t.Helper() + r.Run("Change revision already exists", func(t *testing.T) { client := &mocks.ApplicationClient{} client.On("GetChangeRevision", mock.Anything, mock.Anything).Return(&appclient.ChangeRevisionResponse{ - Revision: ptr.To(newChangeRevision), + Revision: ptr.To("new-revision"), }, nil) + logger, logHook := test2.NewNullLogger() + acrService := newTestACRService(client) acrService.logger = logger - app := createTestApp(appSrc) - orgManifestPath := app.GetAnnotation(appsv1.AnnotationKeyManifestGeneratePaths) - err := acrService.ChangeRevision(r.Context(), app, useAnnotations) - require.NoError(t, err) - assert.Equal(t, orgManifestPath, app.GetAnnotation(appsv1.AnnotationKeyManifestGeneratePaths)) - return acrService, logHook, app - } - testLastLogEntry := func(t *testing.T, hook *test2.Hook, expectedMsg string) { - t.Helper() - lastLogEntry := hook.LastEntry() - if lastLogEntry == nil { - t.Fatal("No log entry") - } - require.Equal(t, expectedMsg, lastLogEntry.Message) - } + app := createTestApp(syncedAppWithHistory) - r.Run("New change revision with annotations", func(t *testing.T) { - acrService, _, app := testNewChangeRevision(t) - app, err := acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) + err := acrService.ChangeRevision(r.Context(), app) require.NoError(t, err) - assert.Len(t, app.GetAnnotations(), 5) - assert.Equal(t, newChangeRevision, app.Status.OperationState.Operation.Sync.ChangeRevision) - assert.Equal(t, newChangeRevision, app.GetAnnotation(CHANGE_REVISION_ANN)) - assert.Equal(t, "[\""+"new-revision"+"\"]", app.GetAnnotation(CHANGE_REVISIONS_ANN)) - assert.Equal(t, gitRevision, app.GetAnnotation(GIT_REVISION_ANN)) - assert.Equal(t, "[\""+gitRevision+"\"]", app.GetAnnotation(GIT_REVISIONS_ANN)) - }) - r.Run("Change revision already exists with annotations", func(t *testing.T) { - acrService, logHook, app := testNewChangeRevision(t) - app, err := acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) - require.NoError(t, err) - err = acrService.ChangeRevision(r.Context(), app, useAnnotations) + app, err = acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) require.NoError(t, err) - testLastLogEntry(t, logHook, "Change revision already calculated for application guestbook") - }) - useAnnotations = false + assert.Equal(t, "new-revision", app.Status.OperationState.Operation.Sync.ChangeRevision) - r.Run("New change revision without annotations", func(t *testing.T) { - acrService, _, app := testNewChangeRevision(t) - app, err := acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) - require.NoError(t, err) - assert.Len(t, app.GetAnnotations(), 1) - assert.Equal(t, newChangeRevision, app.Status.OperationState.Operation.Sync.ChangeRevision) - }) + err = acrService.ChangeRevision(r.Context(), app) - appSrc = syncedAppWithSingleHistory - newChangeRevision = "" - r.Run("No previous revision", func(t *testing.T) { - acrService, logHook, app := testNewChangeRevision(t) - app, err := acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) require.NoError(t, err) - assert.Len(t, app.GetAnnotations(), 1) - testLastLogEntry(t, logHook, "No patch needed") - }) - appSrc = multisourceApp + lastLogEntry := logHook.LastEntry() + if lastLogEntry == nil { + t.Fatal("No log entry") + } - r.Run("No current revision", func(t *testing.T) { - acrService, logHook, app := testNewChangeRevision(t) - app, err := acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(r.Context(), app.Name, metav1.GetOptions{}) - require.NoError(t, err) - assert.Len(t, app.GetAnnotations(), 1) - testLastLogEntry(t, logHook, "Got empty current revision for application guestbook, is it an unsupported multisource or helm repo based application?") + require.Equal(t, "Change revision already calculated for application guestbook", lastLogEntry.Message) }) } diff --git a/assets/swagger.json b/assets/swagger.json index 8492f93da663f..b3c84d5aee6ed 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -218,6 +218,39 @@ } } }, + "/api/v1/application-validate": { + "post": { + "tags": [ + "ApplicationService" + ], + "summary": "Create creates an application", + "operationId": "ApplicationService_ValidateSrcAndDst", + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/v1alpha1Application" + } + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/applicationApplicationValidateResponse" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + } + } + }, "/api/v1/application/changeRevision": { "get": { "tags": [ @@ -1927,6 +1960,45 @@ } } }, + "/api/v1/applications/{name}/rollout-rollback": { + "post": { + "tags": [ + "ApplicationService" + ], + "summary": "Rollback application rollout", + "operationId": "ApplicationService_RollbackApplicationRollout", + "parameters": [ + { + "type": "string", + "name": "name", + "in": "path", + "required": true + }, + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/applicationApplicationRolloutRollbackRequest" + } + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/applicationApplicationRolloutRollbackResponse" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + } + } + }, "/api/v1/applications/{name}/spec": { "put": { "tags": [ @@ -5064,6 +5136,39 @@ } } }, + "applicationApplicationRolloutRollbackRequest": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "rolloutName": { + "type": "string" + }, + "rolloutNamespace": { + "type": "string" + }, + "rolloutRevision": { + "type": "integer", + "format": "int64" + } + } + }, + "applicationApplicationRolloutRollbackResponse": { + "type": "object", + "properties": { + "newRevision": { + "type": "integer", + "format": "int64" + }, + "rollout": { + "type": "string" + } + } + }, "applicationApplicationSyncRequest": { "type": "object", "title": "ApplicationSyncRequest is a request to apply the config state to live state", @@ -5165,6 +5270,17 @@ } } }, + "applicationApplicationValidateResponse": { + "type": "object", + "properties": { + "entity": { + "type": "string" + }, + "error": { + "type": "string" + } + } + }, "applicationChangeRevisionResponse": { "type": "object", "properties": { diff --git a/hack/release/main.go b/hack/release/main.go new file mode 100644 index 0000000000000..88fae0f2b36db --- /dev/null +++ b/hack/release/main.go @@ -0,0 +1,177 @@ +package main + +import ( + "fmt" + "os" + "os/exec" + "strings" + "time" +) + +func main() { + err := release() + if err != nil { + fmt.Printf("Failed to release: %s\n", err.Error()) + } +} + +func getCurrentCommitSha() (string, error) { + // git rev-parse --short HEAD + cmd := exec.Command("git", "rev-parse", "--short", "HEAD") + result, err := cmd.Output() + if err != nil { + return "", err + } + + rs := strings.Split(string(result), "\n") + return strings.Split(rs[0], " ")[0], nil +} + +func getArgoCDVersion() (string, error) { + data, err := os.ReadFile("VERSION") + if err != nil { + return "", err + } + return strings.TrimSpace(string(data)), nil +} + +// function that returns version of the latest release by patern +// {argocd-version}-{timestamp}-{commit-sha} +func getLatestVersion() (string, error) { + commitSha, err := getCurrentCommitSha() + if err != nil { + return "", err + } + + argocdVersion, err := getArgoCDVersion() + if err != nil { + return "", err + } + + return fmt.Sprintf("%s-%s-%s", argocdVersion, time.Now().Format("2006.1.2"), commitSha), nil +} + +func updateVersion(version string) error { + file, err := os.OpenFile("VERSION", os.O_WRONLY|os.O_TRUNC, 0o644) + if err != nil { + return err + } + defer file.Close() + + // Write the new content to the file + _, err = file.WriteString(version) + if err != nil { + return err + } + + return nil +} + +func readChangelog() (string, error) { + data, err := os.ReadFile("changelog/CHANGELOG.md") + if err != nil { + return "", err + } + + return string(data), nil +} + +func moveChangelog() error { + version, err := getLatestVersion() + if err != nil { + return err + } + + // mv changelog/CHANGELOG.md changelog/CHANGELOG-.md + cmd := exec.Command("cp", "changelog/CHANGELOG.md", fmt.Sprintf("changelog/CHANGELOG-%s.md", version)) + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return err + } + + return nil +} + +func release() error { + version, err := getLatestVersion() + if err != nil { + return err + } + + fmt.Printf("Releasing version: %s\n", version) + err = updateVersion(version) + if err != nil { + return err + } + + changelog, err := readChangelog() + if err != nil { + return err + } + + fmt.Printf("Changelog: %s\n", changelog) + release := "release-v" + version + fmt.Printf("Release: %s\n", release) + err = moveChangelog() + if err != nil { + return err + } + fmt.Println("Commit changes") + err = commitChanges(version) + if err != nil { + return err + } + fmt.Println("Create tag") + // git tag -a v2.9.3-2021.07.07-3a4b7f4 -m "Codefresh version for synced 2.9.3" + _ = exec.Command("git", "tag", "-d", release).Run() + cmd := exec.Command("git", "tag", "-a", release, "-m", changelog) + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to tag: %w", err) + } + + fmt.Println("Delete tag") + // git push remote-name --delete tag-name + _ = exec.Command("git", "push", "origin", "--delete", release).Run() + fmt.Println("Push new tag to remote") + // git push origin tags/version + cmd = exec.Command("git", "push", "origin", "tags/"+release) + output, err := cmd.CombinedOutput() + if err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to push tag: %w", err) + } + fmt.Printf("git push output: %s\n", string(output)) + + fmt.Println("Delete tag from remote") + return exec.Command("git", "push", "origin", "--delete", release).Run() +} + +func commitChanges(version string) error { + // git add VERSION + cmd := exec.Command("git", "add", "VERSION") + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to add version: %w", err) + } + + cmd = exec.Command("git", "add", fmt.Sprintf("changelog/CHANGELOG-%s.md", version)) + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to add changelog: %w", err) + } + + cmd = exec.Command("git", "commit", "-m", "chore: update version to "+version) + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to commit changes: %w", err) + } + + cmd = exec.Command("git", "push") + if output, err := cmd.CombinedOutput(); err != nil { + fmt.Print(string(output)) + return fmt.Errorf("failed to push changes: %w", err) + } + + return nil +} diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index 2638b216f76ea..d560cce994a0a 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -3390,201 +3390,206 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 3102 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcf, 0x8f, 0x1c, 0x47, - 0xf5, 0xff, 0xd6, 0xcc, 0xce, 0xee, 0xec, 0x1b, 0xdb, 0x6b, 0x57, 0xec, 0xfd, 0x76, 0xc6, 0x1b, - 0xb3, 0x29, 0xdb, 0xf1, 0x64, 0x6d, 0xcf, 0xd8, 0x13, 0x83, 0x92, 0x4d, 0x42, 0x70, 0xd6, 0xce, - 0x66, 0xc9, 0xda, 0x31, 0xbd, 0x8e, 0x8d, 0xc2, 0x81, 0x74, 0x7a, 0x6a, 0x67, 0x9a, 0x9d, 0xe9, - 0x6e, 0x57, 0xf7, 0x8c, 0x59, 0x85, 0x5c, 0x82, 0x90, 0x22, 0x11, 0x05, 0x01, 0x39, 0x70, 0xe0, - 0x97, 0x12, 0x45, 0x42, 0x08, 0xc4, 0x05, 0x21, 0x24, 0x84, 0x04, 0x87, 0x20, 0x38, 0x44, 0x8a, - 0xe0, 0x1f, 0x40, 0x11, 0xe2, 0x48, 0x2e, 0x39, 0x23, 0x54, 0xd5, 0x55, 0xdd, 0xd5, 0xf3, 0xa3, - 0x67, 0x96, 0x59, 0x88, 0x25, 0x4e, 0xdb, 0xaf, 0xba, 0xfa, 0xd5, 0xe7, 0xbd, 0x7a, 0xf5, 0xde, - 0xab, 0xf7, 0x66, 0xe1, 0x54, 0x40, 0x59, 0x8f, 0xb2, 0x9a, 0xe5, 0xfb, 0x6d, 0xc7, 0xb6, 0x42, - 0xc7, 0x73, 0xf5, 0xe7, 0xaa, 0xcf, 0xbc, 0xd0, 0xc3, 0x25, 0x6d, 0xa8, 0xbc, 0xd4, 0xf4, 0xbc, - 0x66, 0x9b, 0xd6, 0x2c, 0xdf, 0xa9, 0x59, 0xae, 0xeb, 0x85, 0x62, 0x38, 0x88, 0xa6, 0x96, 0xc9, - 0xce, 0xa3, 0x41, 0xd5, 0xf1, 0xc4, 0x5b, 0xdb, 0x63, 0xb4, 0xd6, 0xbb, 0x58, 0x6b, 0x52, 0x97, - 0x32, 0x2b, 0xa4, 0x0d, 0x39, 0xe7, 0x52, 0x32, 0xa7, 0x63, 0xd9, 0x2d, 0xc7, 0xa5, 0x6c, 0xb7, - 0xe6, 0xef, 0x34, 0xf9, 0x40, 0x50, 0xeb, 0xd0, 0xd0, 0x1a, 0xf6, 0xd5, 0x66, 0xd3, 0x09, 0x5b, - 0xdd, 0x97, 0xab, 0xb6, 0xd7, 0xa9, 0x59, 0xac, 0xe9, 0xf9, 0xcc, 0xfb, 0x8a, 0x78, 0x38, 0x6f, - 0x37, 0x6a, 0xbd, 0x47, 0x12, 0x06, 0xba, 0x2c, 0xbd, 0x8b, 0x56, 0xdb, 0x6f, 0x59, 0x83, 0xdc, - 0xae, 0x8e, 0xe1, 0xc6, 0xa8, 0xef, 0x49, 0xdd, 0x88, 0x47, 0x27, 0xf4, 0xd8, 0xae, 0xf6, 0x18, - 0xb1, 0x21, 0x1f, 0x23, 0x38, 0x7c, 0x39, 0x59, 0xef, 0x0b, 0x5d, 0xca, 0x76, 0x31, 0x86, 0x19, - 0xd7, 0xea, 0x50, 0x03, 0x2d, 0xa3, 0xca, 0xbc, 0x29, 0x9e, 0xb1, 0x01, 0x73, 0x8c, 0x6e, 0x33, - 0x1a, 0xb4, 0x8c, 0x9c, 0x18, 0x56, 0x24, 0x2e, 0x43, 0x91, 0x2f, 0x4e, 0xed, 0x30, 0x30, 0xf2, - 0xcb, 0xf9, 0xca, 0xbc, 0x19, 0xd3, 0xb8, 0x02, 0x0b, 0x8c, 0x06, 0x5e, 0x97, 0xd9, 0xf4, 0x16, - 0x65, 0x81, 0xe3, 0xb9, 0xc6, 0x8c, 0xf8, 0xba, 0x7f, 0x98, 0x73, 0x09, 0x68, 0x9b, 0xda, 0xa1, - 0xc7, 0x8c, 0x82, 0x98, 0x12, 0xd3, 0x1c, 0x0f, 0x07, 0x6e, 0xcc, 0x46, 0x78, 0xf8, 0x33, 0x26, - 0x70, 0xc0, 0xf2, 0xfd, 0xeb, 0x56, 0x87, 0x06, 0xbe, 0x65, 0x53, 0x63, 0x4e, 0xbc, 0x4b, 0x8d, - 0x71, 0xcc, 0x12, 0x89, 0x51, 0x14, 0xc0, 0x14, 0x49, 0xd6, 0x60, 0xfe, 0xba, 0xd7, 0xa0, 0xa3, - 0xc5, 0xed, 0x67, 0x9f, 0x1b, 0x64, 0x4f, 0xde, 0x43, 0x70, 0xcc, 0xa4, 0x3d, 0x87, 0xe3, 0xbf, - 0x46, 0x43, 0xab, 0x61, 0x85, 0x56, 0x3f, 0xc7, 0x5c, 0xcc, 0xb1, 0x0c, 0x45, 0x26, 0x27, 0x1b, - 0x39, 0x31, 0x1e, 0xd3, 0x03, 0xab, 0xe5, 0xb3, 0x85, 0x89, 0x54, 0xa8, 0x48, 0xbc, 0x0c, 0xa5, - 0x48, 0x97, 0x1b, 0x6e, 0x83, 0x7e, 0x55, 0x68, 0xaf, 0x60, 0xea, 0x43, 0x78, 0x09, 0xe6, 0x7b, - 0x91, 0x9e, 0x37, 0x1a, 0x42, 0x8b, 0x05, 0x33, 0x19, 0x20, 0x7f, 0x47, 0x70, 0x42, 0xb3, 0x01, - 0x53, 0xee, 0xcc, 0xd5, 0x1e, 0x75, 0xc3, 0x60, 0xb4, 0x40, 0xe7, 0xe0, 0x88, 0xda, 0xc4, 0x7e, - 0x3d, 0x0d, 0xbe, 0xe0, 0x22, 0xea, 0x83, 0x4a, 0x44, 0x7d, 0x8c, 0x0b, 0xa2, 0xe8, 0x17, 0x36, - 0xae, 0x48, 0x31, 0xf5, 0xa1, 0x01, 0x45, 0x15, 0xb2, 0x15, 0x35, 0x9b, 0x52, 0x14, 0xf9, 0x00, - 0x81, 0xa1, 0x09, 0x7a, 0xcd, 0x72, 0x9d, 0x6d, 0x1a, 0x84, 0x93, 0xee, 0x19, 0xda, 0xc7, 0x3d, - 0xab, 0xc0, 0x42, 0x24, 0xd5, 0x0d, 0x7e, 0x1e, 0xb9, 0xff, 0x31, 0x0a, 0xcb, 0xf9, 0x4a, 0xde, - 0xec, 0x1f, 0xe6, 0x7b, 0xa7, 0xd6, 0x0c, 0x8c, 0x59, 0x61, 0xc6, 0xc9, 0x00, 0x79, 0x10, 0xe6, - 0x9f, 0x71, 0xda, 0x74, 0xad, 0xd5, 0x75, 0x77, 0xf0, 0x51, 0x28, 0xd8, 0xfc, 0x41, 0xc8, 0x70, - 0xc0, 0x8c, 0x08, 0xf2, 0x6d, 0x04, 0x0f, 0x8e, 0x92, 0xfa, 0xb6, 0x13, 0xb6, 0xf8, 0xf7, 0xc1, - 0x28, 0xf1, 0xed, 0x16, 0xb5, 0x77, 0x82, 0x6e, 0x47, 0x99, 0xac, 0xa2, 0xa7, 0x13, 0x9f, 0xfc, - 0x14, 0x41, 0x65, 0x2c, 0xa6, 0xdb, 0xcc, 0xf2, 0x7d, 0xca, 0xf0, 0x33, 0x50, 0xb8, 0xc3, 0x5f, - 0x88, 0x03, 0x5a, 0xaa, 0x57, 0xab, 0xba, 0x83, 0x1f, 0xcb, 0xe5, 0xd9, 0xff, 0x33, 0xa3, 0xcf, - 0x71, 0x55, 0xa9, 0x27, 0x27, 0xf8, 0x2c, 0xa6, 0xf8, 0xc4, 0x5a, 0xe4, 0xf3, 0xc5, 0xb4, 0xa7, - 0x67, 0x61, 0xc6, 0xb7, 0x58, 0x48, 0x8e, 0xc1, 0x7d, 0xe9, 0xe3, 0xe1, 0x7b, 0x6e, 0x40, 0xc9, - 0x73, 0x70, 0x5c, 0x1b, 0xbe, 0x65, 0xb5, 0x9d, 0x86, 0x15, 0x52, 0xf5, 0x9a, 0x6f, 0x06, 0x65, - 0xcc, 0x63, 0xd2, 0xad, 0x44, 0x04, 0x5e, 0x84, 0x59, 0xea, 0x86, 0x4e, 0xb8, 0x2b, 0xed, 0x49, - 0x52, 0xe4, 0x25, 0x20, 0xfa, 0x1a, 0x5e, 0xbb, 0xed, 0x75, 0x43, 0xfe, 0xe7, 0x65, 0xcb, 0xde, - 0x89, 0x79, 0x72, 0x27, 0x1c, 0xbd, 0x92, 0xfb, 0xa4, 0x48, 0x7e, 0x74, 0x5c, 0x7a, 0xd7, 0xd4, - 0x1d, 0x4c, 0xde, 0xd4, 0x87, 0xc8, 0x6f, 0xd2, 0xc6, 0xbf, 0xc6, 0xa8, 0x40, 0x7b, 0xa7, 0x4b, - 0x83, 0x10, 0xef, 0x80, 0x1e, 0x22, 0x05, 0xf3, 0x52, 0x7d, 0xa3, 0x9a, 0xc4, 0x98, 0xaa, 0x8a, - 0x31, 0xe2, 0xe1, 0xcb, 0x76, 0xa3, 0xda, 0x7b, 0xa4, 0xea, 0xef, 0x34, 0xab, 0x3c, 0x62, 0xa5, - 0x14, 0xa9, 0x22, 0x96, 0xbe, 0x33, 0xa6, 0xce, 0x9d, 0xeb, 0xa0, 0xeb, 0x07, 0x94, 0x85, 0x42, - 0x07, 0x45, 0x53, 0x52, 0xdc, 0xdc, 0x7a, 0x52, 0x8b, 0xc2, 0x9c, 0x8a, 0x66, 0x4c, 0x93, 0xdf, - 0xa6, 0xd1, 0xbf, 0xe0, 0x37, 0x3e, 0x29, 0xf4, 0x3a, 0xca, 0x5c, 0x1a, 0xa5, 0x6e, 0xf0, 0xf9, - 0xb4, 0xc1, 0xff, 0x32, 0x8d, 0xff, 0x0a, 0x6d, 0xd3, 0x04, 0xff, 0xb0, 0xb3, 0x67, 0xc0, 0x9c, - 0x6d, 0x05, 0xb6, 0xd5, 0x50, 0xab, 0x28, 0x92, 0xfb, 0x5d, 0x9f, 0x79, 0xbe, 0xd5, 0x14, 0x9c, - 0x6e, 0x78, 0x6d, 0xc7, 0xde, 0x95, 0xcb, 0x0d, 0xbe, 0x18, 0x38, 0xa7, 0x33, 0xd9, 0xe7, 0xb4, - 0x90, 0x86, 0x7d, 0x12, 0x4a, 0x5b, 0xbb, 0xae, 0xfd, 0xbc, 0x1f, 0xf9, 0xa2, 0xa3, 0x50, 0x70, - 0x42, 0xda, 0x09, 0x0c, 0x24, 0xfc, 0x50, 0x44, 0x90, 0x7f, 0x16, 0x60, 0x51, 0x93, 0x8d, 0x7f, - 0x90, 0x25, 0x59, 0x96, 0x53, 0x5d, 0x84, 0xd9, 0x06, 0xdb, 0x35, 0xbb, 0xae, 0x34, 0x00, 0x49, - 0xf1, 0x85, 0x7d, 0xd6, 0x75, 0x23, 0xf8, 0x45, 0x33, 0x22, 0xf0, 0x36, 0x14, 0x83, 0x90, 0x27, - 0x45, 0xcd, 0x5d, 0x01, 0xbc, 0x54, 0xff, 0xfc, 0x74, 0x9b, 0xce, 0xa1, 0x6f, 0x49, 0x8e, 0x66, - 0xcc, 0x1b, 0xdf, 0xe1, 0x2e, 0x38, 0xf2, 0xcb, 0x81, 0x31, 0xb7, 0x9c, 0xaf, 0x94, 0xea, 0x5b, - 0xd3, 0x2f, 0xf4, 0xbc, 0xcf, 0x13, 0x3a, 0x2d, 0xe0, 0x9a, 0xc9, 0x2a, 0xdc, 0xeb, 0x77, 0xa4, - 0x3b, 0x0b, 0x64, 0xf2, 0x92, 0x0c, 0xe0, 0x2f, 0x42, 0xc1, 0x71, 0xb7, 0xbd, 0xc0, 0x98, 0x17, - 0x60, 0x9e, 0x9e, 0x0e, 0xcc, 0x86, 0xbb, 0xed, 0x99, 0x11, 0x43, 0x7c, 0x07, 0x0e, 0x32, 0x1a, - 0xb2, 0x5d, 0xa5, 0x05, 0x03, 0x84, 0x5e, 0x9f, 0x9b, 0x6e, 0x05, 0x53, 0x67, 0x69, 0xa6, 0x57, - 0xc0, 0xab, 0x50, 0x0a, 0x12, 0x1b, 0x33, 0x4a, 0x62, 0x41, 0x23, 0xc5, 0x48, 0xb3, 0x41, 0x53, - 0x9f, 0x3c, 0x60, 0xdd, 0x07, 0xb2, 0xad, 0xfb, 0xe0, 0xd8, 0x20, 0x7c, 0x68, 0x82, 0x20, 0xbc, - 0xd0, 0x1f, 0x84, 0x3f, 0x42, 0xb0, 0x34, 0xe0, 0x9c, 0xb6, 0x7c, 0x9a, 0x79, 0x0c, 0x2c, 0x98, - 0x09, 0x7c, 0x6a, 0x0b, 0x57, 0x5d, 0xaa, 0x5f, 0xdb, 0x37, 0x6f, 0x25, 0xd6, 0x15, 0xac, 0xb3, - 0x1c, 0xea, 0x94, 0x7e, 0xe1, 0x47, 0x08, 0xfe, 0x5f, 0x5b, 0xf3, 0x86, 0x15, 0xda, 0xad, 0x2c, - 0x61, 0xf9, 0xf9, 0xe5, 0x73, 0x64, 0x1a, 0x11, 0x11, 0x5c, 0xab, 0xe2, 0xe1, 0xe6, 0xae, 0xcf, - 0x01, 0xf2, 0x37, 0xc9, 0xc0, 0x94, 0xb9, 0xde, 0x37, 0xd3, 0x7b, 0x22, 0xc3, 0xb3, 0x38, 0x6d, - 0xff, 0xfd, 0xa0, 0x41, 0xde, 0x4f, 0xe7, 0x60, 0x03, 0xf1, 0x7d, 0xb4, 0xe6, 0x96, 0x60, 0xde, - 0xd5, 0xb2, 0x6b, 0xa1, 0xa3, 0x78, 0x40, 0x64, 0xcc, 0x11, 0x2f, 0x99, 0x54, 0xe7, 0x44, 0xc6, - 0x9c, 0x0c, 0xe1, 0x15, 0x38, 0xac, 0x91, 0x6a, 0xaf, 0xf9, 0xb4, 0x81, 0x71, 0x71, 0x5b, 0x93, - 0xc8, 0x94, 0x83, 0x2e, 0x88, 0x44, 0xa2, 0x7f, 0x98, 0xfc, 0x0c, 0x41, 0xb9, 0x4f, 0x9e, 0x71, - 0x82, 0x1c, 0x82, 0x9c, 0xd3, 0x90, 0x89, 0x49, 0xce, 0x69, 0xec, 0xd1, 0xd5, 0xf7, 0x1b, 0xc3, - 0x6c, 0xb6, 0x31, 0xcc, 0xa5, 0x8d, 0xe1, 0xe3, 0x3e, 0xb8, 0xca, 0xe1, 0x4e, 0xae, 0x77, 0x94, - 0xd6, 0xfb, 0xe0, 0x6d, 0x26, 0x37, 0x70, 0x9b, 0x31, 0x60, 0xae, 0x17, 0xdf, 0x79, 0x45, 0xb2, - 0x26, 0x49, 0x2e, 0x62, 0x93, 0x79, 0x5d, 0x5f, 0x9a, 0x74, 0x44, 0x70, 0x14, 0x3b, 0x8e, 0xcb, - 0xef, 0x67, 0x02, 0x05, 0x7f, 0xde, 0xfb, 0x2d, 0x37, 0x25, 0xf6, 0xcf, 0x73, 0xf0, 0xa9, 0x21, - 0x62, 0x8f, 0x3d, 0xad, 0xf7, 0x86, 0xec, 0xb1, 0xcf, 0x98, 0x1b, 0xe9, 0x33, 0x8a, 0xe3, 0x7c, - 0xc6, 0x7c, 0xb6, 0xbe, 0x20, 0xad, 0xaf, 0x77, 0x11, 0x1c, 0x5b, 0x6b, 0x59, 0x6e, 0x93, 0x2a, - 0x43, 0x57, 0x5a, 0x32, 0x60, 0x4e, 0xf2, 0x50, 0x89, 0xb7, 0x24, 0xc7, 0xe8, 0xaa, 0x02, 0x0b, - 0x76, 0x97, 0x31, 0xea, 0x26, 0x27, 0x2a, 0xca, 0xd4, 0xfa, 0x87, 0xf9, 0x39, 0xf5, 0x79, 0x44, - 0xf1, 0xba, 0x41, 0x3c, 0x35, 0xf2, 0xc9, 0x03, 0xe3, 0xe4, 0x12, 0x2c, 0xf6, 0xc3, 0x94, 0x17, - 0x04, 0x3d, 0xb7, 0x42, 0xe9, 0x22, 0x03, 0xf9, 0x49, 0x0e, 0x96, 0x87, 0x58, 0xc3, 0xf8, 0x54, - 0xf4, 0x9e, 0x31, 0x87, 0x6d, 0x8f, 0xc9, 0x33, 0x50, 0x34, 0x23, 0x82, 0x7b, 0x11, 0x8f, 0xf9, - 0x2d, 0xcb, 0x15, 0xb6, 0x5f, 0x34, 0x25, 0x35, 0xa5, 0x21, 0x5c, 0x01, 0x43, 0xa9, 0xe7, 0xb2, - 0x1d, 0x05, 0x38, 0x66, 0x75, 0x68, 0x48, 0x59, 0x30, 0x2a, 0xbc, 0xf5, 0xac, 0x76, 0x57, 0x39, - 0xe8, 0x88, 0x20, 0x6f, 0xe6, 0xfa, 0xd9, 0x98, 0x5d, 0xf7, 0xde, 0x57, 0xf4, 0x22, 0xcc, 0x5a, - 0x02, 0xad, 0x3c, 0x78, 0x92, 0x1a, 0x50, 0x69, 0x31, 0x5b, 0xa5, 0xf3, 0x29, 0x95, 0xae, 0xe6, - 0x0c, 0x44, 0x3e, 0xca, 0x41, 0x79, 0x94, 0x42, 0x6e, 0xd5, 0xff, 0xd7, 0x54, 0x82, 0x2d, 0x30, - 0xd8, 0x08, 0x2b, 0x33, 0x40, 0x24, 0xf6, 0xa7, 0x53, 0x69, 0xc6, 0x28, 0x93, 0x34, 0x47, 0xb2, - 0x21, 0xdf, 0x40, 0x70, 0x3c, 0xfd, 0x59, 0xb0, 0xe9, 0x04, 0x61, 0xec, 0x2f, 0xb6, 0x61, 0x2e, - 0x12, 0x25, 0xba, 0xd2, 0x95, 0xea, 0x9b, 0xd3, 0x26, 0xfa, 0xa9, 0xdd, 0x55, 0xcc, 0xc9, 0x63, - 0xa9, 0x5a, 0x49, 0x12, 0x7f, 0x13, 0xb7, 0xa5, 0x2e, 0x37, 0xca, 0x6d, 0x29, 0x9a, 0xbc, 0x33, - 0x93, 0x4e, 0x35, 0xbd, 0xc6, 0xa6, 0xd7, 0xcc, 0x28, 0x4b, 0x66, 0x5b, 0x0c, 0xdf, 0x0d, 0xaf, - 0xa1, 0x55, 0x20, 0x15, 0xc9, 0xbf, 0xb3, 0x3d, 0x37, 0xb4, 0x1c, 0x97, 0x32, 0xe9, 0x79, 0x93, - 0x01, 0xbe, 0xd3, 0x81, 0xe3, 0xda, 0x74, 0x8b, 0xda, 0x9e, 0xdb, 0x08, 0x84, 0xc9, 0xe4, 0xcd, - 0xd4, 0x18, 0x7e, 0x16, 0xe6, 0x05, 0x7d, 0xd3, 0xe9, 0x44, 0x09, 0x4a, 0xa9, 0xbe, 0x52, 0x8d, - 0x5a, 0x05, 0x55, 0xbd, 0x55, 0x90, 0xe8, 0xb0, 0x43, 0x43, 0xab, 0xda, 0xbb, 0x58, 0xe5, 0x5f, - 0x98, 0xc9, 0xc7, 0x1c, 0x4b, 0x68, 0x39, 0xed, 0x4d, 0xc7, 0x15, 0x17, 0x4e, 0xbe, 0x54, 0x32, - 0xc0, 0xad, 0x71, 0x9b, 0xe7, 0x63, 0x77, 0x95, 0xcf, 0x8b, 0x28, 0xfe, 0x55, 0xd7, 0x0d, 0x9d, - 0xb6, 0x58, 0x3f, 0xb2, 0xb5, 0x64, 0x40, 0x7c, 0xe5, 0xb4, 0x43, 0xca, 0xa4, 0xb3, 0x93, 0x54, - 0x6c, 0xef, 0xa5, 0xa8, 0xfa, 0xad, 0x7c, 0x6d, 0x74, 0x32, 0x0e, 0xe8, 0x27, 0xa3, 0xff, 0xb4, - 0x1d, 0x1c, 0x52, 0xc2, 0x15, 0xcd, 0x80, 0x28, 0x5c, 0x19, 0x87, 0xa2, 0x2b, 0x87, 0xa2, 0x07, - 0x4e, 0xcb, 0x42, 0xf6, 0x69, 0x39, 0x9c, 0x3e, 0x2d, 0xe2, 0x46, 0x1c, 0xda, 0xad, 0x35, 0x2b, - 0xa0, 0xc6, 0x11, 0xc1, 0x3a, 0x19, 0x20, 0xbf, 0x43, 0x50, 0xdc, 0xf4, 0x9a, 0x57, 0xdd, 0x90, - 0xed, 0x8a, 0xda, 0x89, 0xe7, 0x86, 0xd4, 0x8d, 0xcb, 0x64, 0x92, 0xe4, 0x5b, 0x14, 0x3a, 0x1d, - 0xba, 0x15, 0x5a, 0x1d, 0x5f, 0xde, 0xbc, 0xf6, 0xb4, 0x45, 0xf1, 0xc7, 0x5c, 0x6d, 0x6d, 0x2b, - 0x08, 0x85, 0xcb, 0x29, 0x9a, 0xe2, 0x99, 0x0b, 0x18, 0x4f, 0xd8, 0x0a, 0x99, 0xf4, 0x37, 0xa9, - 0x31, 0xdd, 0x00, 0x0b, 0x11, 0x36, 0x49, 0x92, 0x0e, 0xdc, 0x1f, 0x97, 0x04, 0x6e, 0x52, 0xd6, - 0x71, 0x5c, 0x2b, 0x3b, 0x2e, 0x4f, 0xd0, 0xa3, 0xc8, 0xa8, 0x48, 0x79, 0xa9, 0x23, 0xc9, 0x6f, - 0xd8, 0xb7, 0x1d, 0xb7, 0xe1, 0xdd, 0xcd, 0x38, 0x5a, 0xd3, 0x2d, 0xf8, 0xe7, 0x74, 0x9b, 0x41, - 0x5b, 0x31, 0xf6, 0x03, 0xcf, 0xc2, 0x41, 0xee, 0x31, 0x7a, 0x54, 0xbe, 0x90, 0x4e, 0x89, 0x8c, - 0xaa, 0xf8, 0x26, 0x3c, 0xcc, 0xf4, 0x87, 0x78, 0x13, 0x16, 0xac, 0x20, 0x70, 0x9a, 0x2e, 0x6d, - 0x28, 0x5e, 0xb9, 0x89, 0x79, 0xf5, 0x7f, 0x1a, 0x15, 0xe3, 0xc4, 0x0c, 0xb9, 0xdf, 0x8a, 0x24, - 0x5f, 0x47, 0x70, 0x6c, 0x28, 0x93, 0xf8, 0x5c, 0x21, 0x2d, 0x8e, 0x94, 0xa1, 0x18, 0xd8, 0x2d, - 0xda, 0xe8, 0xb6, 0x55, 0xaa, 0x10, 0xd3, 0xfc, 0x5d, 0xa3, 0x1b, 0xed, 0xbe, 0x8c, 0x63, 0x31, - 0x8d, 0x4f, 0x00, 0x74, 0x2c, 0xb7, 0x6b, 0xb5, 0x05, 0x84, 0x19, 0x01, 0x41, 0x1b, 0x21, 0x4b, - 0x50, 0x1e, 0x66, 0x3a, 0xb2, 0x50, 0xfd, 0x0f, 0x04, 0x87, 0x94, 0xcb, 0x95, 0xbb, 0x5b, 0x81, - 0x05, 0x4d, 0x0d, 0x5a, 0x5e, 0xdb, 0x3f, 0x3c, 0xc6, 0x9d, 0x2a, 0x2b, 0xc9, 0xa7, 0x3b, 0x85, - 0xbd, 0x54, 0xaf, 0x6f, 0xe2, 0x80, 0x8b, 0xf6, 0xe9, 0xde, 0xf3, 0x35, 0x30, 0xae, 0x59, 0xae, - 0xd5, 0xa4, 0x8d, 0x58, 0xec, 0xd8, 0xc4, 0x5e, 0xd2, 0x4b, 0x98, 0x53, 0x17, 0x0c, 0xe3, 0x24, - 0xda, 0xd9, 0xde, 0x56, 0xe5, 0x50, 0x06, 0xc5, 0x4d, 0xc7, 0xdd, 0xd9, 0x70, 0xb7, 0x3d, 0x2e, - 0x71, 0xe8, 0x84, 0x6d, 0xa5, 0xdd, 0x88, 0xc0, 0x87, 0x21, 0xdf, 0x65, 0x6d, 0x69, 0x01, 0xfc, - 0x91, 0xdf, 0xe3, 0x1b, 0x34, 0xb0, 0x99, 0xe3, 0x87, 0xc9, 0x1d, 0x41, 0x1f, 0xe2, 0xfb, 0xe0, - 0xd8, 0x9e, 0xbb, 0xd6, 0xb6, 0x82, 0x40, 0x85, 0xa7, 0x78, 0x80, 0x3c, 0x01, 0x07, 0xf9, 0x9a, - 0x89, 0x98, 0x67, 0xd3, 0x62, 0x1e, 0x4b, 0xc1, 0x57, 0xf0, 0x14, 0x62, 0x0b, 0xee, 0xe3, 0x59, - 0xc1, 0x65, 0xdf, 0x97, 0x4c, 0x26, 0x4c, 0x51, 0xf3, 0xc3, 0xa2, 0xeb, 0xd0, 0x86, 0x4f, 0xfd, - 0x83, 0x33, 0x80, 0xf5, 0x73, 0x42, 0x59, 0xcf, 0xb1, 0x29, 0xfe, 0x0e, 0x82, 0x19, 0xbe, 0x34, - 0x7e, 0x60, 0xd4, 0xb1, 0x14, 0xf6, 0x5a, 0xde, 0xbf, 0xf2, 0x18, 0x5f, 0x8d, 0x2c, 0xbd, 0xf6, - 0x97, 0xbf, 0x7d, 0x37, 0xb7, 0x88, 0x8f, 0x8a, 0x36, 0x7f, 0xef, 0xa2, 0xde, 0x72, 0x0f, 0xf0, - 0x1b, 0x08, 0xb0, 0xcc, 0x92, 0xb4, 0x46, 0x28, 0x3e, 0x3b, 0x0a, 0xe2, 0x90, 0x86, 0x69, 0xf9, - 0x01, 0x2d, 0xaa, 0x54, 0x6d, 0x8f, 0x51, 0x1e, 0x43, 0xc4, 0x04, 0x01, 0x60, 0x45, 0x00, 0x38, - 0x85, 0xc9, 0x30, 0x00, 0xb5, 0x57, 0xb8, 0x46, 0x5f, 0xad, 0xd1, 0x68, 0xdd, 0xb7, 0x11, 0x14, - 0x6e, 0x8b, 0xbb, 0xef, 0x18, 0x25, 0x6d, 0xed, 0x9b, 0x92, 0xc4, 0x72, 0x02, 0x2d, 0x39, 0x29, - 0x90, 0x3e, 0x80, 0x8f, 0x2b, 0xa4, 0x41, 0xc8, 0xa8, 0xd5, 0x49, 0x01, 0xbe, 0x80, 0xf0, 0xbb, - 0x08, 0x66, 0xa3, 0x96, 0x12, 0x3e, 0x3d, 0x0a, 0x65, 0xaa, 0xe5, 0x54, 0xde, 0xbf, 0x52, 0x1b, - 0x79, 0x58, 0x60, 0x3c, 0x49, 0x86, 0x6e, 0xe7, 0x6a, 0xaa, 0x7b, 0xf3, 0x16, 0x82, 0xfc, 0x3a, - 0x1d, 0x6b, 0x6f, 0xfb, 0x08, 0x6e, 0x40, 0x81, 0x43, 0xb6, 0x1a, 0xbf, 0x83, 0xe0, 0xfe, 0x75, - 0x1a, 0x0e, 0x0f, 0x8f, 0xb8, 0x32, 0x3e, 0x66, 0x49, 0xb3, 0x3b, 0x3b, 0xc1, 0xcc, 0x38, 0x2e, - 0xd4, 0x04, 0xb2, 0x87, 0xf1, 0x99, 0x2c, 0x23, 0x0c, 0x76, 0x5d, 0xfb, 0xae, 0xc4, 0xf1, 0x27, - 0x04, 0x87, 0xfb, 0x7f, 0xf0, 0x80, 0x49, 0xdf, 0x1d, 0x65, 0xc8, 0xef, 0x21, 0xca, 0xd7, 0xa7, - 0xf5, 0xb2, 0x69, 0xa6, 0xe4, 0xb2, 0x40, 0xfe, 0x38, 0x7e, 0x2c, 0x0b, 0x79, 0x5c, 0x9f, 0xaf, - 0xbd, 0xa2, 0x1e, 0x5f, 0x15, 0x3f, 0xce, 0x11, 0xb0, 0xdf, 0x47, 0x70, 0x54, 0xf1, 0x5d, 0x6b, - 0x59, 0x2c, 0xbc, 0x42, 0x79, 0x86, 0x1d, 0x4c, 0x24, 0xcf, 0x94, 0x51, 0x43, 0x5f, 0x8f, 0x5c, - 0x15, 0xb2, 0x3c, 0x85, 0x9f, 0xdc, 0xb3, 0x2c, 0x36, 0x67, 0xd3, 0x90, 0xb0, 0xdf, 0x43, 0x70, - 0x68, 0x9d, 0x86, 0xcf, 0xaf, 0x6d, 0xec, 0x69, 0x67, 0xa6, 0x34, 0x74, 0x6d, 0x39, 0x72, 0x45, - 0x08, 0xf2, 0x59, 0xfc, 0xc4, 0x9e, 0x05, 0xf1, 0x6c, 0x27, 0xde, 0x97, 0xd7, 0x10, 0x1c, 0x58, - 0xa7, 0xe1, 0xb5, 0xb8, 0xd7, 0x75, 0x7a, 0xa2, 0x76, 0x7f, 0x79, 0xa9, 0xaa, 0xfd, 0xb6, 0x49, - 0xbd, 0x8a, 0x4d, 0xfd, 0xbc, 0xc0, 0x76, 0x06, 0x9f, 0xce, 0xc2, 0x96, 0xf4, 0xd7, 0xde, 0x46, - 0x70, 0x4c, 0x07, 0x91, 0xfc, 0x4c, 0xe2, 0xd3, 0x7b, 0xfb, 0xf1, 0x81, 0xfc, 0x09, 0xc3, 0x18, - 0x74, 0x75, 0x81, 0xee, 0x1c, 0x19, 0x7e, 0x10, 0x3b, 0x03, 0x28, 0x56, 0xd1, 0x4a, 0x05, 0xe1, - 0xdf, 0x23, 0x98, 0x8d, 0x5a, 0x4d, 0xa3, 0x75, 0x94, 0xea, 0x93, 0xef, 0xa7, 0x57, 0x93, 0x56, - 0x5b, 0xbe, 0x30, 0x5c, 0xa1, 0xfa, 0xf7, 0x6a, 0x6b, 0xab, 0x42, 0xcb, 0x69, 0x77, 0xfc, 0x2b, - 0x04, 0x90, 0xb4, 0xcb, 0xf0, 0xc3, 0xd9, 0x72, 0x68, 0x2d, 0xb5, 0xf2, 0xfe, 0x36, 0xcc, 0x48, - 0x55, 0xc8, 0x53, 0x29, 0x2f, 0x67, 0xfa, 0x42, 0x9f, 0xda, 0xab, 0x51, 0x6b, 0xed, 0xc7, 0x08, - 0x0a, 0xa2, 0x8e, 0x8e, 0x4f, 0x8d, 0xc2, 0xac, 0x97, 0xd9, 0xf7, 0x53, 0xf5, 0x0f, 0x09, 0xa8, - 0xcb, 0xf5, 0xac, 0x80, 0xb2, 0x8a, 0x56, 0x70, 0x0f, 0x66, 0xa3, 0xda, 0xee, 0x68, 0xf3, 0x48, - 0xd5, 0x7e, 0xcb, 0xcb, 0x19, 0x09, 0x4e, 0x64, 0xa8, 0x32, 0x96, 0xad, 0x8c, 0x8b, 0x65, 0x33, - 0x3c, 0xdc, 0xe0, 0x93, 0x59, 0xc1, 0xe8, 0x3f, 0xa0, 0x98, 0xb3, 0x02, 0xdd, 0x69, 0xb2, 0x3c, - 0x2e, 0x9e, 0x71, 0xed, 0x7c, 0x0f, 0xc1, 0xe1, 0xfe, 0x4b, 0x02, 0x3e, 0x3e, 0xb4, 0xde, 0x26, - 0x63, 0x6b, 0x5a, 0x8b, 0xa3, 0x2e, 0x18, 0xe4, 0x73, 0x02, 0xc5, 0x2a, 0x7e, 0x74, 0xec, 0xc9, - 0xb8, 0xae, 0xbc, 0x0e, 0x67, 0x74, 0x3e, 0xe9, 0xfd, 0xff, 0x1a, 0xc1, 0x01, 0xc5, 0xf7, 0x26, - 0xa3, 0x34, 0x1b, 0xd6, 0xfe, 0x1d, 0x04, 0xbe, 0x16, 0x79, 0x42, 0xc0, 0xff, 0x0c, 0xbe, 0x34, - 0x21, 0x7c, 0x05, 0xfb, 0x7c, 0xc8, 0x91, 0xfe, 0x01, 0xc1, 0x91, 0xdb, 0x91, 0xdd, 0x7f, 0x42, - 0xf8, 0xd7, 0x04, 0xfe, 0x27, 0xf1, 0xe3, 0x19, 0xf9, 0xea, 0x38, 0x31, 0x2e, 0x20, 0xfc, 0x0b, - 0x04, 0x45, 0xd5, 0xd5, 0xc4, 0x67, 0x46, 0x1e, 0x8c, 0x74, 0xdf, 0x73, 0x3f, 0x8d, 0x59, 0x26, - 0x67, 0xe4, 0x54, 0x66, 0x34, 0x95, 0xeb, 0x73, 0x83, 0x7e, 0x0b, 0x01, 0x8e, 0xef, 0xfe, 0x71, - 0x35, 0x00, 0x3f, 0x94, 0x5a, 0x6a, 0x64, 0x81, 0xa9, 0x7c, 0x66, 0xec, 0xbc, 0x74, 0x28, 0x5d, - 0xc9, 0x0c, 0xa5, 0x5e, 0xbc, 0xfe, 0x9b, 0x08, 0x4a, 0xeb, 0x34, 0xbe, 0x4b, 0x65, 0xe8, 0x32, - 0xdd, 0x94, 0x2d, 0x57, 0xc6, 0x4f, 0x94, 0x88, 0xce, 0x09, 0x44, 0x0f, 0xe1, 0x6c, 0x55, 0x29, - 0x00, 0xdf, 0x47, 0x70, 0xf0, 0x86, 0x6e, 0xa2, 0xf8, 0xdc, 0xb8, 0x95, 0x52, 0x9e, 0x7c, 0x72, - 0x5c, 0x8f, 0x08, 0x5c, 0xe7, 0xc9, 0x44, 0xb8, 0x56, 0x65, 0x7f, 0xf3, 0x87, 0x28, 0xba, 0x8c, - 0xf7, 0x55, 0xed, 0xff, 0x5d, 0xbd, 0x65, 0x14, 0xff, 0xc9, 0x25, 0x81, 0xaf, 0x8a, 0xcf, 0x4d, - 0x82, 0xaf, 0x26, 0x4b, 0xf9, 0xf8, 0x07, 0x08, 0x8e, 0x88, 0xb6, 0x8d, 0xce, 0x18, 0x67, 0x75, - 0x2a, 0x92, 0x26, 0xcf, 0x04, 0x21, 0xe6, 0xa9, 0xc8, 0xff, 0x90, 0x3d, 0x81, 0x5a, 0x95, 0x0d, - 0x99, 0xd7, 0x73, 0x88, 0xef, 0xef, 0x7d, 0x03, 0xf8, 0x6e, 0xd5, 0xfb, 0x14, 0x38, 0xba, 0x0d, - 0x35, 0x01, 0xc6, 0x55, 0x81, 0xf1, 0x12, 0xa9, 0xed, 0x05, 0x63, 0xad, 0x57, 0xe7, 0xc7, 0xf4, - 0x5b, 0x08, 0x0e, 0xa9, 0xb0, 0x2b, 0xed, 0xef, 0xfc, 0xb8, 0xad, 0xdd, 0x6b, 0x98, 0x96, 0x07, - 0x62, 0x65, 0xb2, 0x03, 0xf1, 0x2e, 0x82, 0x39, 0xd9, 0x55, 0xc9, 0x48, 0x66, 0xb4, 0xb6, 0x4b, - 0xb9, 0xaf, 0x9a, 0x24, 0xcb, 0xee, 0xe4, 0x4b, 0x62, 0xd9, 0x17, 0x70, 0xa6, 0x5a, 0x7c, 0xaf, - 0x11, 0xd4, 0x5e, 0x91, 0x35, 0xef, 0x57, 0x6b, 0x6d, 0xaf, 0x19, 0xbc, 0x48, 0x70, 0x66, 0xc8, - 0xe6, 0x73, 0x2e, 0x20, 0x1c, 0xc2, 0x3c, 0x37, 0x5f, 0x51, 0xa2, 0xc2, 0xcb, 0x7d, 0x05, 0xad, - 0x81, 0xea, 0x55, 0xb9, 0x3c, 0x50, 0xf2, 0x4a, 0x62, 0xb4, 0x2c, 0x18, 0xe0, 0x07, 0x33, 0x97, - 0x15, 0x0b, 0xbd, 0x81, 0xe0, 0x88, 0x7e, 0x1e, 0xa3, 0xe5, 0x27, 0x3e, 0x8d, 0x59, 0x28, 0x64, - 0xda, 0x8f, 0x57, 0x26, 0x32, 0xa3, 0x08, 0xce, 0xeb, 0x08, 0x8e, 0xac, 0xd3, 0x30, 0xdd, 0xfe, - 0xef, 0xbb, 0xe9, 0x0d, 0xfd, 0x09, 0x43, 0xf9, 0x64, 0xe6, 0x1c, 0x09, 0x29, 0xab, 0x2e, 0xc5, - 0xef, 0x9b, 0xda, 0x37, 0x4f, 0x3f, 0xf3, 0xc7, 0x0f, 0x4f, 0xa0, 0x0f, 0x3e, 0x3c, 0x81, 0xfe, - 0xfa, 0xe1, 0x09, 0xf4, 0xe2, 0xa3, 0x93, 0xfd, 0x77, 0x8b, 0xdd, 0x76, 0xa8, 0x1b, 0xea, 0x6c, - 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0x92, 0x89, 0xa1, 0xd6, 0xc3, 0x33, 0x00, 0x00, + // 3180 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xdf, 0x8f, 0x1c, 0x47, + 0xf1, 0xff, 0xf6, 0xde, 0xed, 0xdd, 0x5e, 0xad, 0xed, 0xf3, 0x75, 0xec, 0xfb, 0x4e, 0xd6, 0x17, + 0x73, 0x69, 0xdb, 0xf1, 0xe6, 0xec, 0xdb, 0xb5, 0x37, 0x06, 0x92, 0x4b, 0x42, 0x70, 0xce, 0x8e, + 0x73, 0xe4, 0xec, 0x98, 0x39, 0xc7, 0x46, 0xe1, 0x81, 0x4c, 0x66, 0xfb, 0x76, 0x87, 0xdb, 0x9d, + 0x19, 0xf7, 0xcc, 0xae, 0x39, 0x85, 0xbc, 0x04, 0x21, 0x45, 0x22, 0x0a, 0x02, 0xf2, 0x80, 0xc4, + 0x4f, 0x25, 0x8a, 0x40, 0x08, 0xc4, 0x0b, 0x8a, 0x90, 0x10, 0x12, 0x3c, 0x04, 0xc1, 0x43, 0xa4, + 0x08, 0xfe, 0x01, 0x14, 0x21, 0x1e, 0xc9, 0x4b, 0x9e, 0x11, 0xea, 0x9e, 0xee, 0x99, 0x9e, 0xfd, + 0x31, 0xbb, 0xc7, 0x1e, 0xc4, 0x12, 0x4f, 0x37, 0xd5, 0xdb, 0x53, 0xfd, 0xa9, 0xea, 0xea, 0xaa, + 0xea, 0xaa, 0x39, 0x38, 0x19, 0x50, 0xd6, 0xa5, 0xac, 0x6a, 0xf9, 0x7e, 0xcb, 0xb1, 0xad, 0xd0, + 0xf1, 0x5c, 0xfd, 0xb9, 0xe2, 0x33, 0x2f, 0xf4, 0x70, 0x51, 0x1b, 0x2a, 0x2d, 0x35, 0x3c, 0xaf, + 0xd1, 0xa2, 0x55, 0xcb, 0x77, 0xaa, 0x96, 0xeb, 0x7a, 0xa1, 0x18, 0x0e, 0xa2, 0xa9, 0x25, 0xb2, + 0xf3, 0x70, 0x50, 0x71, 0x3c, 0xf1, 0xab, 0xed, 0x31, 0x5a, 0xed, 0x9e, 0xaf, 0x36, 0xa8, 0x4b, + 0x99, 0x15, 0xd2, 0xba, 0x9c, 0x73, 0x21, 0x99, 0xd3, 0xb6, 0xec, 0xa6, 0xe3, 0x52, 0xb6, 0x5b, + 0xf5, 0x77, 0x1a, 0x7c, 0x20, 0xa8, 0xb6, 0x69, 0x68, 0x0d, 0x7a, 0x6b, 0xb3, 0xe1, 0x84, 0xcd, + 0xce, 0x8b, 0x15, 0xdb, 0x6b, 0x57, 0x2d, 0xd6, 0xf0, 0x7c, 0xe6, 0x7d, 0x59, 0x3c, 0xac, 0xda, + 0xf5, 0x6a, 0xf7, 0xa1, 0x84, 0x81, 0x2e, 0x4b, 0xf7, 0xbc, 0xd5, 0xf2, 0x9b, 0x56, 0x3f, 0xb7, + 0xcb, 0x23, 0xb8, 0x31, 0xea, 0x7b, 0x52, 0x37, 0xe2, 0xd1, 0x09, 0x3d, 0xb6, 0xab, 0x3d, 0x46, + 0x6c, 0xc8, 0x47, 0x08, 0x0e, 0x5f, 0x4c, 0xd6, 0xfb, 0x7c, 0x87, 0xb2, 0x5d, 0x8c, 0x61, 0xda, + 0xb5, 0xda, 0xd4, 0x40, 0xcb, 0xa8, 0x3c, 0x67, 0x8a, 0x67, 0x6c, 0xc0, 0x2c, 0xa3, 0xdb, 0x8c, + 0x06, 0x4d, 0x23, 0x27, 0x86, 0x15, 0x89, 0x4b, 0x50, 0xe0, 0x8b, 0x53, 0x3b, 0x0c, 0x8c, 0xa9, + 0xe5, 0xa9, 0xf2, 0x9c, 0x19, 0xd3, 0xb8, 0x0c, 0xf3, 0x8c, 0x06, 0x5e, 0x87, 0xd9, 0xf4, 0x26, + 0x65, 0x81, 0xe3, 0xb9, 0xc6, 0xb4, 0x78, 0xbb, 0x77, 0x98, 0x73, 0x09, 0x68, 0x8b, 0xda, 0xa1, + 0xc7, 0x8c, 0xbc, 0x98, 0x12, 0xd3, 0x1c, 0x0f, 0x07, 0x6e, 0xcc, 0x44, 0x78, 0xf8, 0x33, 0x26, + 0x70, 0xc0, 0xf2, 0xfd, 0x6b, 0x56, 0x9b, 0x06, 0xbe, 0x65, 0x53, 0x63, 0x56, 0xfc, 0x96, 0x1a, + 0xe3, 0x98, 0x25, 0x12, 0xa3, 0x20, 0x80, 0x29, 0x92, 0xac, 0xc3, 0xdc, 0x35, 0xaf, 0x4e, 0x87, + 0x8b, 0xdb, 0xcb, 0x3e, 0xd7, 0xcf, 0x9e, 0xbc, 0x8b, 0xe0, 0xa8, 0x49, 0xbb, 0x0e, 0xc7, 0x7f, + 0x95, 0x86, 0x56, 0xdd, 0x0a, 0xad, 0x5e, 0x8e, 0xb9, 0x98, 0x63, 0x09, 0x0a, 0x4c, 0x4e, 0x36, + 0x72, 0x62, 0x3c, 0xa6, 0xfb, 0x56, 0x9b, 0xca, 0x16, 0x26, 0x52, 0xa1, 0x22, 0xf1, 0x32, 0x14, + 0x23, 0x5d, 0x6e, 0xb8, 0x75, 0xfa, 0x15, 0xa1, 0xbd, 0xbc, 0xa9, 0x0f, 0xe1, 0x25, 0x98, 0xeb, + 0x46, 0x7a, 0xde, 0xa8, 0x0b, 0x2d, 0xe6, 0xcd, 0x64, 0x80, 0xfc, 0x1d, 0xc1, 0x71, 0xcd, 0x06, + 0x4c, 0xb9, 0x33, 0x97, 0xbb, 0xd4, 0x0d, 0x83, 0xe1, 0x02, 0x9d, 0x85, 0x05, 0xb5, 0x89, 0xbd, + 0x7a, 0xea, 0xff, 0x81, 0x8b, 0xa8, 0x0f, 0x2a, 0x11, 0xf5, 0x31, 0x2e, 0x88, 0xa2, 0x9f, 0xdb, + 0xb8, 0x24, 0xc5, 0xd4, 0x87, 0xfa, 0x14, 0x95, 0xcf, 0x56, 0xd4, 0x4c, 0x4a, 0x51, 0xe4, 0x7d, + 0x04, 0x86, 0x26, 0xe8, 0x55, 0xcb, 0x75, 0xb6, 0x69, 0x10, 0x8e, 0xbb, 0x67, 0x68, 0x1f, 0xf7, + 0xac, 0x0c, 0xf3, 0x91, 0x54, 0xd7, 0xf9, 0x79, 0xe4, 0xfe, 0xc7, 0xc8, 0x2f, 0x4f, 0x95, 0xa7, + 0xcc, 0xde, 0x61, 0xbe, 0x77, 0x6a, 0xcd, 0xc0, 0x98, 0x11, 0x66, 0x9c, 0x0c, 0x90, 0xfb, 0x61, + 0xee, 0x29, 0xa7, 0x45, 0xd7, 0x9b, 0x1d, 0x77, 0x07, 0x1f, 0x81, 0xbc, 0xcd, 0x1f, 0x84, 0x0c, + 0x07, 0xcc, 0x88, 0x20, 0xdf, 0x42, 0x70, 0xff, 0x30, 0xa9, 0x6f, 0x39, 0x61, 0x93, 0xbf, 0x1f, + 0x0c, 0x13, 0xdf, 0x6e, 0x52, 0x7b, 0x27, 0xe8, 0xb4, 0x95, 0xc9, 0x2a, 0x7a, 0x32, 0xf1, 0xc9, + 0xcf, 0x10, 0x94, 0x47, 0x62, 0xba, 0xc5, 0x2c, 0xdf, 0xa7, 0x0c, 0x3f, 0x05, 0xf9, 0xdb, 0xfc, + 0x07, 0x71, 0x40, 0x8b, 0xb5, 0x4a, 0x45, 0x77, 0xf0, 0x23, 0xb9, 0x3c, 0xfd, 0x7f, 0x66, 0xf4, + 0x3a, 0xae, 0x28, 0xf5, 0xe4, 0x04, 0x9f, 0xc5, 0x14, 0x9f, 0x58, 0x8b, 0x7c, 0xbe, 0x98, 0xf6, + 0xe4, 0x0c, 0x4c, 0xfb, 0x16, 0x0b, 0xc9, 0x51, 0xb8, 0x27, 0x7d, 0x3c, 0x7c, 0xcf, 0x0d, 0x28, + 0x79, 0x06, 0x8e, 0x69, 0xc3, 0x37, 0xad, 0x96, 0x53, 0xb7, 0x42, 0xaa, 0x7e, 0xe6, 0x9b, 0x41, + 0x19, 0xf3, 0x98, 0x74, 0x2b, 0x11, 0x81, 0x17, 0x61, 0x86, 0xba, 0xa1, 0x13, 0xee, 0x4a, 0x7b, + 0x92, 0x14, 0x79, 0x01, 0x88, 0xbe, 0x86, 0xd7, 0x6a, 0x79, 0x9d, 0x90, 0xff, 0x79, 0xd1, 0xb2, + 0x77, 0x62, 0x9e, 0xdc, 0x09, 0x47, 0x3f, 0xc9, 0x7d, 0x52, 0x24, 0x3f, 0x3a, 0x2e, 0xbd, 0x63, + 0xea, 0x0e, 0x66, 0xca, 0xd4, 0x87, 0xc8, 0x6f, 0xd2, 0xc6, 0xbf, 0xce, 0xa8, 0x40, 0x7b, 0xbb, + 0x43, 0x83, 0x10, 0xef, 0x80, 0x1e, 0x22, 0x05, 0xf3, 0x62, 0x6d, 0xa3, 0x92, 0xc4, 0x98, 0x8a, + 0x8a, 0x31, 0xe2, 0xe1, 0x4b, 0x76, 0xbd, 0xd2, 0x7d, 0xa8, 0xe2, 0xef, 0x34, 0x2a, 0x3c, 0x62, + 0xa5, 0x14, 0xa9, 0x22, 0x96, 0xbe, 0x33, 0xa6, 0xce, 0x9d, 0xeb, 0xa0, 0xe3, 0x07, 0x94, 0x85, + 0x42, 0x07, 0x05, 0x53, 0x52, 0xdc, 0xdc, 0xba, 0x52, 0x8b, 0xc2, 0x9c, 0x0a, 0x66, 0x4c, 0x93, + 0xdf, 0xa6, 0xd1, 0x3f, 0xe7, 0xd7, 0x3f, 0x2e, 0xf4, 0x3a, 0xca, 0x5c, 0x1a, 0xa5, 0x6e, 0xf0, + 0x53, 0x69, 0x83, 0xff, 0x55, 0x1a, 0xff, 0x25, 0xda, 0xa2, 0x09, 0xfe, 0x41, 0x67, 0xcf, 0x80, + 0x59, 0xdb, 0x0a, 0x6c, 0xab, 0xae, 0x56, 0x51, 0x24, 0xf7, 0xbb, 0x3e, 0xf3, 0x7c, 0xab, 0x21, + 0x38, 0x5d, 0xf7, 0x5a, 0x8e, 0xbd, 0x2b, 0x97, 0xeb, 0xff, 0xa1, 0xef, 0x9c, 0x4e, 0x67, 0x9f, + 0xd3, 0x7c, 0x1a, 0xf6, 0x09, 0x28, 0x6e, 0xed, 0xba, 0xf6, 0xb3, 0x7e, 0xe4, 0x8b, 0x8e, 0x40, + 0xde, 0x09, 0x69, 0x3b, 0x30, 0x90, 0xf0, 0x43, 0x11, 0x41, 0xfe, 0x99, 0x87, 0x45, 0x4d, 0x36, + 0xfe, 0x42, 0x96, 0x64, 0x59, 0x4e, 0x75, 0x11, 0x66, 0xea, 0x6c, 0xd7, 0xec, 0xb8, 0xd2, 0x00, + 0x24, 0xc5, 0x17, 0xf6, 0x59, 0xc7, 0x8d, 0xe0, 0x17, 0xcc, 0x88, 0xc0, 0xdb, 0x50, 0x08, 0x42, + 0x9e, 0x14, 0x35, 0x76, 0x05, 0xf0, 0x62, 0xed, 0x73, 0x93, 0x6d, 0x3a, 0x87, 0xbe, 0x25, 0x39, + 0x9a, 0x31, 0x6f, 0x7c, 0x9b, 0xbb, 0xe0, 0xc8, 0x2f, 0x07, 0xc6, 0xec, 0xf2, 0x54, 0xb9, 0x58, + 0xdb, 0x9a, 0x7c, 0xa1, 0x67, 0x7d, 0x9e, 0xd0, 0x69, 0x01, 0xd7, 0x4c, 0x56, 0xe1, 0x5e, 0xbf, + 0x2d, 0xdd, 0x59, 0x20, 0x93, 0x97, 0x64, 0x00, 0x7f, 0x01, 0xf2, 0x8e, 0xbb, 0xed, 0x05, 0xc6, + 0x9c, 0x00, 0xf3, 0xe4, 0x64, 0x60, 0x36, 0xdc, 0x6d, 0xcf, 0x8c, 0x18, 0xe2, 0xdb, 0x70, 0x90, + 0xd1, 0x90, 0xed, 0x2a, 0x2d, 0x18, 0x20, 0xf4, 0xfa, 0xcc, 0x64, 0x2b, 0x98, 0x3a, 0x4b, 0x33, + 0xbd, 0x02, 0x5e, 0x83, 0x62, 0x90, 0xd8, 0x98, 0x51, 0x14, 0x0b, 0x1a, 0x29, 0x46, 0x9a, 0x0d, + 0x9a, 0xfa, 0xe4, 0x3e, 0xeb, 0x3e, 0x90, 0x6d, 0xdd, 0x07, 0x47, 0x06, 0xe1, 0x43, 0x63, 0x04, + 0xe1, 0xf9, 0xde, 0x20, 0xfc, 0x21, 0x82, 0xa5, 0x3e, 0xe7, 0xb4, 0xe5, 0xd3, 0xcc, 0x63, 0x60, + 0xc1, 0x74, 0xe0, 0x53, 0x5b, 0xb8, 0xea, 0x62, 0xed, 0xea, 0xbe, 0x79, 0x2b, 0xb1, 0xae, 0x60, + 0x9d, 0xe5, 0x50, 0x27, 0xf4, 0x0b, 0x3f, 0x42, 0xf0, 0xff, 0xda, 0x9a, 0xd7, 0xad, 0xd0, 0x6e, + 0x66, 0x09, 0xcb, 0xcf, 0x2f, 0x9f, 0x23, 0xd3, 0x88, 0x88, 0xe0, 0x5a, 0x15, 0x0f, 0x37, 0x76, + 0x7d, 0x0e, 0x90, 0xff, 0x92, 0x0c, 0x4c, 0x98, 0xeb, 0x7d, 0x23, 0xbd, 0x27, 0x32, 0x3c, 0x8b, + 0xd3, 0xf6, 0xdf, 0x0f, 0x1a, 0xe4, 0xbd, 0x74, 0x0e, 0xd6, 0x17, 0xdf, 0x87, 0x6b, 0x6e, 0x09, + 0xe6, 0x5c, 0x2d, 0xbb, 0x16, 0x3a, 0x8a, 0x07, 0x44, 0xc6, 0x1c, 0xf1, 0x92, 0x49, 0x75, 0x4e, + 0x64, 0xcc, 0xc9, 0x10, 0x5e, 0x81, 0xc3, 0x1a, 0xa9, 0xf6, 0x9a, 0x4f, 0xeb, 0x1b, 0x17, 0xb7, + 0x35, 0x89, 0x4c, 0x39, 0xe8, 0xbc, 0x48, 0x24, 0x7a, 0x87, 0xc9, 0xcf, 0x11, 0x94, 0x7a, 0xe4, + 0x19, 0x25, 0xc8, 0x21, 0xc8, 0x39, 0x75, 0x99, 0x98, 0xe4, 0x9c, 0xfa, 0x1e, 0x5d, 0x7d, 0xaf, + 0x31, 0xcc, 0x64, 0x1b, 0xc3, 0x6c, 0xda, 0x18, 0x3e, 0xea, 0x81, 0xab, 0x1c, 0xee, 0xf8, 0x7a, + 0x47, 0x69, 0xbd, 0xf7, 0xdf, 0x66, 0x72, 0x7d, 0xb7, 0x19, 0x03, 0x66, 0xbb, 0xf1, 0x9d, 0x57, + 0x24, 0x6b, 0x92, 0xe4, 0x22, 0x36, 0x98, 0xd7, 0xf1, 0xa5, 0x49, 0x47, 0x04, 0x47, 0xb1, 0xe3, + 0xb8, 0xfc, 0x7e, 0x26, 0x50, 0xf0, 0xe7, 0xbd, 0xdf, 0x72, 0x53, 0x62, 0xff, 0x22, 0x07, 0x9f, + 0x18, 0x20, 0xf6, 0xc8, 0xd3, 0x7a, 0x77, 0xc8, 0x1e, 0xfb, 0x8c, 0xd9, 0xa1, 0x3e, 0xa3, 0x30, + 0xca, 0x67, 0xcc, 0x65, 0xeb, 0x0b, 0xd2, 0xfa, 0x7a, 0x1b, 0xc1, 0xd1, 0xf5, 0xa6, 0xe5, 0x36, + 0xa8, 0x32, 0x74, 0xa5, 0x25, 0x03, 0x66, 0x25, 0x0f, 0x95, 0x78, 0x4b, 0x72, 0x84, 0xae, 0xca, + 0x30, 0x6f, 0x77, 0x18, 0xa3, 0x6e, 0x72, 0xa2, 0xa2, 0x4c, 0xad, 0x77, 0x98, 0x9f, 0x53, 0x9f, + 0x47, 0x14, 0xaf, 0x13, 0xc4, 0x53, 0x23, 0x9f, 0xdc, 0x37, 0x4e, 0x2e, 0xc0, 0x62, 0x2f, 0x4c, + 0x79, 0x41, 0xd0, 0x73, 0x2b, 0x94, 0x2e, 0x32, 0x90, 0x9f, 0xe6, 0x60, 0x79, 0x80, 0x35, 0x8c, + 0x4e, 0x45, 0xef, 0x1a, 0x73, 0xd8, 0xf6, 0x98, 0x3c, 0x03, 0x05, 0x33, 0x22, 0xb8, 0x17, 0xf1, + 0x98, 0xdf, 0xb4, 0x5c, 0x61, 0xfb, 0x05, 0x53, 0x52, 0x13, 0x1a, 0xc2, 0x25, 0x30, 0x94, 0x7a, + 0x2e, 0xda, 0x51, 0x80, 0x63, 0x56, 0x9b, 0x86, 0x94, 0x05, 0xc3, 0xc2, 0x5b, 0xd7, 0x6a, 0x75, + 0x94, 0x83, 0x8e, 0x08, 0xf2, 0x7a, 0xae, 0x97, 0x8d, 0xd9, 0x71, 0xef, 0x7e, 0x45, 0x2f, 0xc2, + 0x8c, 0x25, 0xd0, 0xca, 0x83, 0x27, 0xa9, 0x3e, 0x95, 0x16, 0xb2, 0x55, 0x3a, 0x97, 0x52, 0xe9, + 0x5a, 0xce, 0x40, 0xe4, 0xc3, 0x1c, 0x94, 0x86, 0x29, 0xe4, 0x66, 0xed, 0x7f, 0x4d, 0x25, 0xd8, + 0x02, 0x83, 0x0d, 0xb1, 0x32, 0x03, 0x44, 0x62, 0x7f, 0x2a, 0x95, 0x66, 0x0c, 0x33, 0x49, 0x73, + 0x28, 0x1b, 0xf2, 0x75, 0x04, 0xc7, 0xd2, 0xaf, 0x05, 0x9b, 0x4e, 0x10, 0xc6, 0xfe, 0x62, 0x1b, + 0x66, 0x23, 0x51, 0xa2, 0x2b, 0x5d, 0xb1, 0xb6, 0x39, 0x69, 0xa2, 0x9f, 0xda, 0x5d, 0xc5, 0x9c, + 0x3c, 0x92, 0xaa, 0x95, 0x24, 0xf1, 0x37, 0x71, 0x5b, 0xea, 0x72, 0xa3, 0xdc, 0x96, 0xa2, 0xc9, + 0x5b, 0xd3, 0xe9, 0x54, 0xd3, 0xab, 0x6f, 0x7a, 0x8d, 0x8c, 0xb2, 0x64, 0xb6, 0xc5, 0xf0, 0xdd, + 0xf0, 0xea, 0x5a, 0x05, 0x52, 0x91, 0xfc, 0x3d, 0xdb, 0x73, 0x43, 0xcb, 0x71, 0x29, 0x93, 0x9e, + 0x37, 0x19, 0xe0, 0x3b, 0x1d, 0x38, 0xae, 0x4d, 0xb7, 0xa8, 0xed, 0xb9, 0xf5, 0x40, 0x98, 0xcc, + 0x94, 0x99, 0x1a, 0xc3, 0x4f, 0xc3, 0x9c, 0xa0, 0x6f, 0x38, 0xed, 0x28, 0x41, 0x29, 0xd6, 0x56, + 0x2a, 0x51, 0xab, 0xa0, 0xa2, 0xb7, 0x0a, 0x12, 0x1d, 0xb6, 0x69, 0x68, 0x55, 0xba, 0xe7, 0x2b, + 0xfc, 0x0d, 0x33, 0x79, 0x99, 0x63, 0x09, 0x2d, 0xa7, 0xb5, 0xe9, 0xb8, 0xe2, 0xc2, 0xc9, 0x97, + 0x4a, 0x06, 0xb8, 0x35, 0x6e, 0xf3, 0x7c, 0xec, 0x8e, 0xf2, 0x79, 0x11, 0xc5, 0xdf, 0xea, 0xb8, + 0xa1, 0xd3, 0x12, 0xeb, 0x47, 0xb6, 0x96, 0x0c, 0x88, 0xb7, 0x9c, 0x56, 0x48, 0x99, 0x74, 0x76, + 0x92, 0x8a, 0xed, 0xbd, 0x18, 0x55, 0xbf, 0x95, 0xaf, 0x8d, 0x4e, 0xc6, 0x01, 0xfd, 0x64, 0xf4, + 0x9e, 0xb6, 0x83, 0x03, 0x4a, 0xb8, 0xa2, 0x19, 0x10, 0x85, 0x2b, 0xe3, 0x50, 0x74, 0xe5, 0x50, + 0x74, 0xdf, 0x69, 0x99, 0xcf, 0x3e, 0x2d, 0x87, 0xd3, 0xa7, 0x45, 0xdc, 0x88, 0x43, 0xbb, 0xb9, + 0x6e, 0x05, 0xd4, 0x58, 0x10, 0xac, 0x93, 0x01, 0xf2, 0x3b, 0x04, 0x85, 0x4d, 0xaf, 0x71, 0xd9, + 0x0d, 0xd9, 0xae, 0xa8, 0x9d, 0x78, 0x6e, 0x48, 0xdd, 0xb8, 0x4c, 0x26, 0x49, 0xbe, 0x45, 0xa1, + 0xd3, 0xa6, 0x5b, 0xa1, 0xd5, 0xf6, 0xe5, 0xcd, 0x6b, 0x4f, 0x5b, 0x14, 0xbf, 0xcc, 0xd5, 0xd6, + 0xb2, 0x82, 0x50, 0xb8, 0x9c, 0x82, 0x29, 0x9e, 0xb9, 0x80, 0xf1, 0x84, 0xad, 0x90, 0x49, 0x7f, + 0x93, 0x1a, 0xd3, 0x0d, 0x30, 0x1f, 0x61, 0x93, 0x24, 0x69, 0xc3, 0xbd, 0x71, 0x49, 0xe0, 0x06, + 0x65, 0x6d, 0xc7, 0xb5, 0xb2, 0xe3, 0xf2, 0x18, 0x3d, 0x8a, 0x8c, 0x8a, 0x94, 0x97, 0x3a, 0x92, + 0xfc, 0x86, 0x7d, 0xcb, 0x71, 0xeb, 0xde, 0x9d, 0x8c, 0xa3, 0x35, 0xd9, 0x82, 0x7f, 0x4e, 0xb7, + 0x19, 0xb4, 0x15, 0x63, 0x3f, 0xf0, 0x34, 0x1c, 0xe4, 0x1e, 0xa3, 0x4b, 0xe5, 0x0f, 0xd2, 0x29, + 0x91, 0x61, 0x15, 0xdf, 0x84, 0x87, 0x99, 0x7e, 0x11, 0x6f, 0xc2, 0xbc, 0x15, 0x04, 0x4e, 0xc3, + 0xa5, 0x75, 0xc5, 0x2b, 0x37, 0x36, 0xaf, 0xde, 0x57, 0xa3, 0x62, 0x9c, 0x98, 0x21, 0xf7, 0x5b, + 0x91, 0xe4, 0x6b, 0x08, 0x8e, 0x0e, 0x64, 0x12, 0x9f, 0x2b, 0xa4, 0xc5, 0x91, 0x12, 0x14, 0x02, + 0xbb, 0x49, 0xeb, 0x9d, 0x96, 0x4a, 0x15, 0x62, 0x9a, 0xff, 0x56, 0xef, 0x44, 0xbb, 0x2f, 0xe3, + 0x58, 0x4c, 0xe3, 0xe3, 0x00, 0x6d, 0xcb, 0xed, 0x58, 0x2d, 0x01, 0x61, 0x5a, 0x40, 0xd0, 0x46, + 0xc8, 0x12, 0x94, 0x06, 0x99, 0x8e, 0x2c, 0x54, 0xff, 0x03, 0xc1, 0x21, 0xe5, 0x72, 0xe5, 0xee, + 0x96, 0x61, 0x5e, 0x53, 0x83, 0x96, 0xd7, 0xf6, 0x0e, 0x8f, 0x70, 0xa7, 0xca, 0x4a, 0xa6, 0xd2, + 0x9d, 0xc2, 0x6e, 0xaa, 0xd7, 0x37, 0x76, 0xc0, 0x45, 0xfb, 0x74, 0xef, 0xf9, 0x2a, 0x18, 0x57, + 0x2d, 0xd7, 0x6a, 0xd0, 0x7a, 0x2c, 0x76, 0x6c, 0x62, 0x2f, 0xe8, 0x25, 0xcc, 0x89, 0x0b, 0x86, + 0x71, 0x12, 0xed, 0x6c, 0x6f, 0xab, 0x72, 0x28, 0x83, 0xc2, 0xa6, 0xe3, 0xee, 0x6c, 0xb8, 0xdb, + 0x1e, 0x97, 0x38, 0x74, 0xc2, 0x96, 0xd2, 0x6e, 0x44, 0xe0, 0xc3, 0x30, 0xd5, 0x61, 0x2d, 0x69, + 0x01, 0xfc, 0x91, 0xdf, 0xe3, 0xeb, 0x34, 0xb0, 0x99, 0xe3, 0x87, 0xc9, 0x1d, 0x41, 0x1f, 0xe2, + 0xfb, 0xe0, 0xd8, 0x9e, 0xbb, 0xde, 0xb2, 0x82, 0x40, 0x85, 0xa7, 0x78, 0x80, 0x3c, 0x06, 0x07, + 0xf9, 0x9a, 0x89, 0x98, 0x67, 0xd2, 0x62, 0x1e, 0x4d, 0xc1, 0x57, 0xf0, 0x14, 0x62, 0x0b, 0xee, + 0xe1, 0x59, 0xc1, 0x45, 0xdf, 0x97, 0x4c, 0xc6, 0x4c, 0x51, 0xa7, 0x06, 0x45, 0xd7, 0x81, 0x0d, + 0x9f, 0xda, 0x4f, 0x56, 0x00, 0xeb, 0xe7, 0x84, 0xb2, 0xae, 0x63, 0x53, 0xfc, 0x6d, 0x04, 0xd3, + 0x7c, 0x69, 0x7c, 0xdf, 0xb0, 0x63, 0x29, 0xec, 0xb5, 0xb4, 0x7f, 0xe5, 0x31, 0xbe, 0x1a, 0x59, + 0x7a, 0xe5, 0x2f, 0x7f, 0xfb, 0x4e, 0x6e, 0x11, 0x1f, 0x11, 0x6d, 0xfe, 0xee, 0x79, 0xbd, 0xe5, + 0x1e, 0xe0, 0xd7, 0x10, 0x60, 0x99, 0x25, 0x69, 0x8d, 0x50, 0x7c, 0x66, 0x18, 0xc4, 0x01, 0x0d, + 0xd3, 0xd2, 0x7d, 0x5a, 0x54, 0xa9, 0xd8, 0x1e, 0xa3, 0x3c, 0x86, 0x88, 0x09, 0x02, 0xc0, 0x8a, + 0x00, 0x70, 0x12, 0x93, 0x41, 0x00, 0xaa, 0x2f, 0x71, 0x8d, 0xbe, 0x5c, 0xa5, 0xd1, 0xba, 0x6f, + 0x22, 0xc8, 0xdf, 0x12, 0x77, 0xdf, 0x11, 0x4a, 0xda, 0xda, 0x37, 0x25, 0x89, 0xe5, 0x04, 0x5a, + 0x72, 0x42, 0x20, 0xbd, 0x0f, 0x1f, 0x53, 0x48, 0x83, 0x90, 0x51, 0xab, 0x9d, 0x02, 0x7c, 0x0e, + 0xe1, 0xb7, 0x11, 0xcc, 0x44, 0x2d, 0x25, 0x7c, 0x6a, 0x18, 0xca, 0x54, 0xcb, 0xa9, 0xb4, 0x7f, + 0xa5, 0x36, 0xf2, 0xa0, 0xc0, 0x78, 0x82, 0x0c, 0xdc, 0xce, 0xb5, 0x54, 0xf7, 0xe6, 0x0d, 0x04, + 0x53, 0x57, 0xe8, 0x48, 0x7b, 0xdb, 0x47, 0x70, 0x7d, 0x0a, 0x1c, 0xb0, 0xd5, 0xf8, 0x2d, 0x04, + 0xf7, 0x5e, 0xa1, 0xe1, 0xe0, 0xf0, 0x88, 0xcb, 0xa3, 0x63, 0x96, 0x34, 0xbb, 0x33, 0x63, 0xcc, + 0x8c, 0xe3, 0x42, 0x55, 0x20, 0x7b, 0x10, 0x9f, 0xce, 0x32, 0xc2, 0x60, 0xd7, 0xb5, 0xef, 0x48, + 0x1c, 0x7f, 0x42, 0x70, 0xb8, 0xf7, 0x83, 0x07, 0x4c, 0x7a, 0xee, 0x28, 0x03, 0xbe, 0x87, 0x28, + 0x5d, 0x9b, 0xd4, 0xcb, 0xa6, 0x99, 0x92, 0x8b, 0x02, 0xf9, 0xa3, 0xf8, 0x91, 0x2c, 0xe4, 0x71, + 0x7d, 0xbe, 0xfa, 0x92, 0x7a, 0x7c, 0x59, 0x7c, 0x9c, 0x23, 0x60, 0xbf, 0x87, 0xe0, 0x88, 0xe2, + 0xbb, 0xde, 0xb4, 0x58, 0x78, 0x89, 0xf2, 0x0c, 0x3b, 0x18, 0x4b, 0x9e, 0x09, 0xa3, 0x86, 0xbe, + 0x1e, 0xb9, 0x2c, 0x64, 0x79, 0x02, 0x3f, 0xbe, 0x67, 0x59, 0x6c, 0xce, 0xa6, 0x2e, 0x61, 0xbf, + 0x8b, 0xe0, 0xd0, 0x15, 0x1a, 0x3e, 0xbb, 0xbe, 0xb1, 0xa7, 0x9d, 0x99, 0xd0, 0xd0, 0xb5, 0xe5, + 0xc8, 0x25, 0x21, 0xc8, 0x67, 0xf0, 0x63, 0x7b, 0x16, 0xc4, 0xb3, 0x9d, 0x78, 0x5f, 0x5e, 0x41, + 0x70, 0xe0, 0x0a, 0x0d, 0xaf, 0xc6, 0xbd, 0xae, 0x53, 0x63, 0xb5, 0xfb, 0x4b, 0x4b, 0x15, 0xed, + 0xdb, 0x26, 0xf5, 0x53, 0x6c, 0xea, 0xab, 0x02, 0xdb, 0x69, 0x7c, 0x2a, 0x0b, 0x5b, 0xd2, 0x5f, + 0x7b, 0x13, 0xc1, 0x51, 0x1d, 0x44, 0xf2, 0x99, 0xc4, 0x27, 0xf7, 0xf6, 0xf1, 0x81, 0xfc, 0x84, + 0x61, 0x04, 0xba, 0x9a, 0x40, 0x77, 0x96, 0x0c, 0x3e, 0x88, 0xed, 0x3e, 0x14, 0x6b, 0x68, 0xa5, + 0x8c, 0xf0, 0xef, 0x11, 0xcc, 0x44, 0xad, 0xa6, 0xe1, 0x3a, 0x4a, 0xf5, 0xc9, 0xf7, 0xd3, 0xab, + 0x49, 0xab, 0x2d, 0x9d, 0x1b, 0xac, 0x50, 0xfd, 0x7d, 0xb5, 0xb5, 0x15, 0xa1, 0xe5, 0xb4, 0x3b, + 0x7e, 0x07, 0x01, 0x24, 0xed, 0x32, 0xfc, 0x60, 0xb6, 0x1c, 0x5a, 0x4b, 0xad, 0xb4, 0xbf, 0x0d, + 0x33, 0x52, 0x11, 0xf2, 0x94, 0x4b, 0xcb, 0x99, 0xbe, 0xd0, 0xa7, 0xf6, 0x5a, 0xd4, 0x5a, 0xfb, + 0x31, 0x82, 0xbc, 0xa8, 0xa3, 0xe3, 0x93, 0xc3, 0x30, 0xeb, 0x65, 0xf6, 0xfd, 0x54, 0xfd, 0x03, + 0x02, 0xea, 0x72, 0x2d, 0x2b, 0xa0, 0xac, 0xa1, 0x15, 0xdc, 0x85, 0x99, 0xa8, 0xb6, 0x3b, 0xdc, + 0x3c, 0x52, 0xb5, 0xdf, 0xd2, 0x72, 0x46, 0x82, 0x13, 0x19, 0xaa, 0x8c, 0x65, 0x2b, 0xa3, 0x62, + 0xd9, 0x34, 0x0f, 0x37, 0xf8, 0x44, 0x56, 0x30, 0xfa, 0x0f, 0x28, 0xe6, 0x8c, 0x40, 0x77, 0x8a, + 0x2c, 0x8f, 0x8a, 0x67, 0x5c, 0x3b, 0xdf, 0x45, 0x70, 0xb8, 0xf7, 0x92, 0x80, 0x8f, 0x0d, 0xac, + 0xb7, 0xc9, 0xd8, 0x9a, 0xd6, 0xe2, 0xb0, 0x0b, 0x06, 0xf9, 0xac, 0x40, 0xb1, 0x86, 0x1f, 0x1e, + 0x79, 0x32, 0xae, 0x29, 0xaf, 0xc3, 0x19, 0xad, 0x26, 0xbd, 0xff, 0x5f, 0x23, 0x38, 0xa0, 0xf8, + 0xde, 0x60, 0x94, 0x66, 0xc3, 0xda, 0xbf, 0x83, 0xc0, 0xd7, 0x22, 0x8f, 0x09, 0xf8, 0x9f, 0xc2, + 0x17, 0xc6, 0x84, 0xaf, 0x60, 0xaf, 0x86, 0x1c, 0xe9, 0x1f, 0x10, 0x2c, 0xdc, 0x8a, 0xec, 0xfe, + 0x63, 0xc2, 0xbf, 0x2e, 0xf0, 0x3f, 0x8e, 0x1f, 0xcd, 0xc8, 0x57, 0x47, 0x89, 0x71, 0x0e, 0xe1, + 0x5f, 0x22, 0x28, 0xa8, 0xae, 0x26, 0x3e, 0x3d, 0xf4, 0x60, 0xa4, 0xfb, 0x9e, 0xfb, 0x69, 0xcc, + 0x32, 0x39, 0x23, 0x27, 0x33, 0xa3, 0xa9, 0x5c, 0x9f, 0x1b, 0xf4, 0x1b, 0x08, 0x70, 0x7c, 0xf7, + 0x8f, 0xab, 0x01, 0xf8, 0x81, 0xd4, 0x52, 0x43, 0x0b, 0x4c, 0xa5, 0xd3, 0x23, 0xe7, 0xa5, 0x43, + 0xe9, 0x4a, 0x66, 0x28, 0xf5, 0xe2, 0xf5, 0x5f, 0x47, 0x50, 0xbc, 0x42, 0xe3, 0xbb, 0x54, 0x86, + 0x2e, 0xd3, 0x4d, 0xd9, 0x52, 0x79, 0xf4, 0x44, 0x89, 0xe8, 0xac, 0x40, 0xf4, 0x00, 0xce, 0x56, + 0x95, 0x02, 0xf0, 0x7d, 0x04, 0x07, 0xaf, 0xeb, 0x26, 0x8a, 0xcf, 0x8e, 0x5a, 0x29, 0xe5, 0xc9, + 0xc7, 0xc7, 0xf5, 0x90, 0xc0, 0xb5, 0x4a, 0xc6, 0xc2, 0xb5, 0x26, 0xfb, 0x9b, 0x3f, 0x44, 0xd1, + 0x65, 0xbc, 0xa7, 0x6a, 0xff, 0xef, 0xea, 0x2d, 0xa3, 0xf8, 0x4f, 0x2e, 0x08, 0x7c, 0x15, 0x7c, + 0x76, 0x1c, 0x7c, 0x55, 0x59, 0xca, 0xc7, 0x3f, 0x40, 0xb0, 0x20, 0xda, 0x36, 0x3a, 0x63, 0x9c, + 0xd5, 0xa9, 0x48, 0x9a, 0x3c, 0x63, 0x84, 0x98, 0x27, 0x22, 0xff, 0x43, 0xf6, 0x04, 0x6a, 0x4d, + 0x36, 0x64, 0x5e, 0xcd, 0x21, 0xbe, 0xbf, 0xf7, 0xf4, 0xe1, 0xbb, 0x59, 0xeb, 0x51, 0xe0, 0xf0, + 0x36, 0xd4, 0x18, 0x18, 0xd7, 0x04, 0xc6, 0x0b, 0xa4, 0xba, 0x17, 0x8c, 0xd5, 0x6e, 0x8d, 0x1f, + 0xd3, 0x77, 0x10, 0x94, 0x94, 0xdb, 0xe8, 0xff, 0x22, 0x04, 0x57, 0xb2, 0x5c, 0x4d, 0xff, 0x27, + 0x23, 0xa5, 0xea, 0xd8, 0xf3, 0x25, 0xf6, 0x4f, 0x0b, 0xec, 0xe7, 0x47, 0xe8, 0x37, 0x7a, 0x79, + 0x55, 0xf7, 0x2f, 0xdf, 0x43, 0xb0, 0xa0, 0x3e, 0x72, 0xdd, 0x62, 0xf6, 0x45, 0xb7, 0x7e, 0x29, + 0x08, 0x87, 0x67, 0x6c, 0x7d, 0x1f, 0xdc, 0x0c, 0x3f, 0x38, 0xbd, 0x9f, 0xce, 0x92, 0xf3, 0x02, + 0xe3, 0x19, 0xb2, 0x34, 0x00, 0xe3, 0xaa, 0xfa, 0x82, 0x29, 0x9d, 0x48, 0x7e, 0x13, 0xc1, 0x21, + 0x95, 0xcd, 0xc8, 0x63, 0xbd, 0x3a, 0xea, 0xc4, 0xec, 0x35, 0xfb, 0x91, 0x7e, 0x66, 0x65, 0x3c, + 0x3f, 0xf3, 0x36, 0x82, 0x59, 0xd9, 0xac, 0xca, 0xc8, 0x11, 0xb5, 0x6e, 0x56, 0xa9, 0xa7, 0x48, + 0x27, 0xbb, 0x19, 0xe4, 0x8b, 0x62, 0xd9, 0xe7, 0x70, 0xa6, 0xb5, 0xf9, 0x5e, 0x3d, 0xa8, 0xbe, + 0x24, 0x5b, 0x09, 0x2f, 0x57, 0x5b, 0x5e, 0x23, 0x78, 0x9e, 0xe0, 0xcc, 0x4c, 0x88, 0xcf, 0x39, + 0x87, 0x70, 0x08, 0x73, 0xdc, 0x2b, 0x88, 0xca, 0x1f, 0x5e, 0xee, 0xa9, 0x13, 0xf6, 0x15, 0x05, + 0x4b, 0xa5, 0xbe, 0x4a, 0x62, 0x92, 0xfa, 0xc8, 0x3a, 0x0c, 0xbe, 0x3f, 0x73, 0x59, 0xb1, 0xd0, + 0x6b, 0x08, 0x16, 0x74, 0x37, 0x17, 0x2d, 0x3f, 0xb6, 0x93, 0xcb, 0x42, 0x21, 0x6f, 0x53, 0x78, + 0x65, 0xac, 0xd3, 0x19, 0xc1, 0x79, 0x15, 0xc1, 0xc2, 0x15, 0x1a, 0xa6, 0xbf, 0xaa, 0xe8, 0xb9, + 0x40, 0x0f, 0xfc, 0x32, 0xa4, 0x74, 0x22, 0x73, 0x8e, 0x84, 0x94, 0x55, 0xee, 0xe3, 0xd7, 0x78, + 0xed, 0x9d, 0x27, 0x9f, 0xfa, 0xe3, 0x07, 0xc7, 0xd1, 0xfb, 0x1f, 0x1c, 0x47, 0x7f, 0xfd, 0xe0, + 0x38, 0x7a, 0xfe, 0xe1, 0xf1, 0xfe, 0x69, 0xc8, 0x6e, 0x39, 0xd4, 0x0d, 0x75, 0xb6, 0xff, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0xa3, 0xf2, 0xe6, 0x52, 0x1a, 0x35, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3654,6 +3659,10 @@ type ApplicationServiceClient interface { RunResourceAction(ctx context.Context, in *ResourceActionRunRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) // RunResourceActionV2 runs a resource action with parameters RunResourceActionV2(ctx context.Context, in *ResourceActionRunRequestV2, opts ...grpc.CallOption) (*ApplicationResponse, error) + // Rollback application rollout + RollbackApplicationRollout(ctx context.Context, in *ApplicationRolloutRollbackRequest, opts ...grpc.CallOption) (*ApplicationRolloutRollbackResponse, error) + // Create creates an application + ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationValidateResponse, error) // DeleteResource deletes a single application resource DeleteResource(ctx context.Context, in *ApplicationResourceDeleteRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) // PodLogs returns stream of log entries for the specified pod. Pod @@ -3980,6 +3989,24 @@ func (c *applicationServiceClient) RunResourceActionV2(ctx context.Context, in * return out, nil } +func (c *applicationServiceClient) RollbackApplicationRollout(ctx context.Context, in *ApplicationRolloutRollbackRequest, opts ...grpc.CallOption) (*ApplicationRolloutRollbackResponse, error) { + out := new(ApplicationRolloutRollbackResponse) + err := c.cc.Invoke(ctx, "/application.ApplicationService/RollbackApplicationRollout", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *applicationServiceClient) ValidateSrcAndDst(ctx context.Context, in *ApplicationValidationRequest, opts ...grpc.CallOption) (*ApplicationValidateResponse, error) { + out := new(ApplicationValidateResponse) + err := c.cc.Invoke(ctx, "/application.ApplicationService/ValidateSrcAndDst", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *applicationServiceClient) DeleteResource(ctx context.Context, in *ApplicationResourceDeleteRequest, opts ...grpc.CallOption) (*ApplicationResponse, error) { out := new(ApplicationResponse) err := c.cc.Invoke(ctx, "/application.ApplicationService/DeleteResource", in, out, opts...) @@ -4105,6 +4132,10 @@ type ApplicationServiceServer interface { RunResourceAction(context.Context, *ResourceActionRunRequest) (*ApplicationResponse, error) // RunResourceActionV2 runs a resource action with parameters RunResourceActionV2(context.Context, *ResourceActionRunRequestV2) (*ApplicationResponse, error) + // Rollback application rollout + RollbackApplicationRollout(context.Context, *ApplicationRolloutRollbackRequest) (*ApplicationRolloutRollbackResponse, error) + // Create creates an application + ValidateSrcAndDst(context.Context, *ApplicationValidationRequest) (*ApplicationValidateResponse, error) // DeleteResource deletes a single application resource DeleteResource(context.Context, *ApplicationResourceDeleteRequest) (*ApplicationResponse, error) // PodLogs returns stream of log entries for the specified pod. Pod @@ -4199,6 +4230,12 @@ func (*UnimplementedApplicationServiceServer) RunResourceAction(ctx context.Cont func (*UnimplementedApplicationServiceServer) RunResourceActionV2(ctx context.Context, req *ResourceActionRunRequestV2) (*ApplicationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RunResourceActionV2 not implemented") } +func (*UnimplementedApplicationServiceServer) RollbackApplicationRollout(ctx context.Context, req *ApplicationRolloutRollbackRequest) (*ApplicationRolloutRollbackResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RollbackApplicationRollout not implemented") +} +func (*UnimplementedApplicationServiceServer) ValidateSrcAndDst(ctx context.Context, req *ApplicationValidationRequest) (*ApplicationValidateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ValidateSrcAndDst not implemented") +} func (*UnimplementedApplicationServiceServer) DeleteResource(ctx context.Context, req *ApplicationResourceDeleteRequest) (*ApplicationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteResource not implemented") } @@ -4701,6 +4738,42 @@ func _ApplicationService_RunResourceActionV2_Handler(srv interface{}, ctx contex return interceptor(ctx, in, info, handler) } +func _ApplicationService_RollbackApplicationRollout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApplicationRolloutRollbackRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApplicationServiceServer).RollbackApplicationRollout(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/application.ApplicationService/RollbackApplicationRollout", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApplicationServiceServer).RollbackApplicationRollout(ctx, req.(*ApplicationRolloutRollbackRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ApplicationService_ValidateSrcAndDst_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApplicationValidationRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ApplicationServiceServer).ValidateSrcAndDst(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/application.ApplicationService/ValidateSrcAndDst", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ApplicationServiceServer).ValidateSrcAndDst(ctx, req.(*ApplicationValidationRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _ApplicationService_DeleteResource_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ApplicationResourceDeleteRequest) if err := dec(in); err != nil { @@ -4890,6 +4963,14 @@ var _ApplicationService_serviceDesc = grpc.ServiceDesc{ MethodName: "RunResourceActionV2", Handler: _ApplicationService_RunResourceActionV2_Handler, }, + { + MethodName: "RollbackApplicationRollout", + Handler: _ApplicationService_RollbackApplicationRollout_Handler, + }, + { + MethodName: "ValidateSrcAndDst", + Handler: _ApplicationService_ValidateSrcAndDst_Handler, + }, { MethodName: "DeleteResource", Handler: _ApplicationService_DeleteResource_Handler, diff --git a/pkg/apiclient/application/application.pb.gw.go b/pkg/apiclient/application/application.pb.gw.go index 61452d3b213c0..3de9d39fd80a4 100644 --- a/pkg/apiclient/application/application.pb.gw.go +++ b/pkg/apiclient/application/application.pb.gw.go @@ -1873,6 +1873,110 @@ func local_request_ApplicationService_RunResourceActionV2_0(ctx context.Context, } +func request_ApplicationService_RollbackApplicationRollout_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ApplicationRolloutRollbackRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + + protoReq.Name, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + + msg, err := client.RollbackApplicationRollout(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_ApplicationService_RollbackApplicationRollout_0(ctx context.Context, marshaler runtime.Marshaler, server ApplicationServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ApplicationRolloutRollbackRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["name"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") + } + + protoReq.Name, err = runtime.StringP(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) + } + + msg, err := server.RollbackApplicationRollout(ctx, &protoReq) + return msg, metadata, err + +} + +func request_ApplicationService_ValidateSrcAndDst_0(ctx context.Context, marshaler runtime.Marshaler, client ApplicationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ApplicationValidationRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Application); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.ValidateSrcAndDst(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_ApplicationService_ValidateSrcAndDst_0(ctx context.Context, marshaler runtime.Marshaler, server ApplicationServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq ApplicationValidationRequest + var metadata runtime.ServerMetadata + + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Application); err != nil && err != io.EOF { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.ValidateSrcAndDst(ctx, &protoReq) + return msg, metadata, err + +} + var ( filter_ApplicationService_DeleteResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) @@ -2784,6 +2888,52 @@ func RegisterApplicationServiceHandlerServer(ctx context.Context, mux *runtime.S }) + mux.Handle("POST", pattern_ApplicationService_RollbackApplicationRollout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_ApplicationService_RollbackApplicationRollout_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_RollbackApplicationRollout_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_ApplicationService_ValidateSrcAndDst_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_ApplicationService_ValidateSrcAndDst_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_ValidateSrcAndDst_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("DELETE", pattern_ApplicationService_DeleteResource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -3451,6 +3601,46 @@ func RegisterApplicationServiceHandlerClient(ctx context.Context, mux *runtime.S }) + mux.Handle("POST", pattern_ApplicationService_RollbackApplicationRollout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_ApplicationService_RollbackApplicationRollout_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_RollbackApplicationRollout_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("POST", pattern_ApplicationService_ValidateSrcAndDst_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_ApplicationService_ValidateSrcAndDst_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_ApplicationService_ValidateSrcAndDst_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("DELETE", pattern_ApplicationService_DeleteResource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -3627,6 +3817,10 @@ var ( pattern_ApplicationService_RunResourceActionV2_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5, 2, 6}, []string{"api", "v1", "applications", "name", "resource", "actions", "v2"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_ApplicationService_RollbackApplicationRollout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "rollout-rollback"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_ApplicationService_ValidateSrcAndDst_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "application-validate"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_ApplicationService_DeleteResource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"api", "v1", "applications", "name", "resource"}, "", runtime.AssumeColonVerbOpt(true))) pattern_ApplicationService_PodLogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "applications", "name", "pods", "podName", "logs"}, "", runtime.AssumeColonVerbOpt(true))) @@ -3693,6 +3887,10 @@ var ( forward_ApplicationService_RunResourceActionV2_0 = runtime.ForwardResponseMessage + forward_ApplicationService_RollbackApplicationRollout_0 = runtime.ForwardResponseMessage + + forward_ApplicationService_ValidateSrcAndDst_0 = runtime.ForwardResponseMessage + forward_ApplicationService_DeleteResource_0 = runtime.ForwardResponseMessage forward_ApplicationService_PodLogs_0 = runtime.ForwardResponseStream diff --git a/server/application/application.proto b/server/application/application.proto index c1449b5d8cc70..ef0cacb5f4200 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -538,6 +538,22 @@ service ApplicationService { }; } + // Rollback application rollout + rpc RollbackApplicationRollout(ApplicationRolloutRollbackRequest) returns (ApplicationRolloutRollbackResponse) { + option (google.api.http) = { + post: "/api/v1/applications/{name}/rollout-rollback" + body: "*" + }; + } + + // Create creates an application + rpc ValidateSrcAndDst(ApplicationValidationRequest) returns (ApplicationValidateResponse) { + option (google.api.http) = { + post: "/api/v1/application-validate" + body: "application" + }; + } + // DeleteResource deletes a single application resource rpc DeleteResource(ApplicationResourceDeleteRequest) returns (ApplicationResponse) { option (google.api.http).delete = "/api/v1/applications/{name}/resource"; diff --git a/server/application/application_rollout_rollback.go b/server/application/application_rollout_rollback.go index ec96a28190b9c..2168b14cf85c8 100644 --- a/server/application/application_rollout_rollback.go +++ b/server/application/application_rollout_rollback.go @@ -78,7 +78,6 @@ func (s *Server) getRsOfSpecificRevision(ctx context.Context, config *rest.Confi if err != nil { return nil, fmt.Errorf("error getting resource: %w", err) } - v := resource.GetRevision(rsliveObj) switch toRevision { case 0: diff --git a/server/application/application_validate_src_and_dest.go b/server/application/application_validate_src_and_dest.go index 94eb1f8033242..d79a26ede132e 100644 --- a/server/application/application_validate_src_and_dest.go +++ b/server/application/application_validate_src_and_dest.go @@ -5,6 +5,8 @@ import ( "errors" "fmt" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" apierrors "k8s.io/apimachinery/pkg/api/errors" "github.com/argoproj/argo-cd/v3/pkg/apiclient/application" @@ -71,5 +73,22 @@ func validateDestination(ctx context.Context, dest *appv1.ApplicationDestination return errors.New("no destination defined in app spec") } _, err := argo.GetDestinationCluster(ctx, *dest, db) - return err + if err != nil { + return err + } + + if dest.Server != "" { + // Ensure the k8s cluster the app is referencing, is configured in Argo CD + _, err := db.GetCluster(ctx, dest.Server) + if err != nil { + if errStatus, ok := status.FromError(err); ok && errStatus.Code() == codes.NotFound { + return fmt.Errorf("cluster '%s' has not been configured", dest.Server) + } + return err + } + } else if dest.Server == "" { + return errors.New("destination server missing from app spec") + } + + return nil } diff --git a/util/kustomize/kustomize_test.go b/util/kustomize/kustomize_test.go index e29b9a6124ef6..373740fc3cc62 100644 --- a/util/kustomize/kustomize_test.go +++ b/util/kustomize/kustomize_test.go @@ -611,7 +611,7 @@ func TestFailKustomizeBuildPatches(t *testing.T) { }, } - _, _, _, err = kustomize.Build(&kustomizeSource, nil, nil, nil, "some-namespace") + _, _, _, err = kustomize.Build(&kustomizeSource, nil, nil, nil, "") require.EqualError(t, err, "kustomization file not found in the path") }