From 16e275c71fcd3f2768581eb6f43f30cb5c5f6080 Mon Sep 17 00:00:00 2001 From: Sergey Smolnikov Date: Thu, 13 Jul 2023 16:16:09 +0200 Subject: [PATCH] Added method giving radix component deployments --- api/deployments/deployment_handler.go | 36 ++++++++++- .../mock/deployment_handler_mock.go | 27 ++++++-- .../models/component_deployment_builder.go | 50 +++++++++++++++ api/deployments/models/deployment_summary.go | 38 ++++++++++++ api/environments/environment_controller.go | 62 +++++++++++++++++++ .../environment_controller_secrets_test.go | 6 +- api/environments/utils.go | 2 +- api/jobs/job_handler.go | 4 +- api/jobs/job_handler_test.go | 10 +-- .../mock/tls_secret_validator_mock.go | 34 +++++----- go.mod | 2 +- go.sum | 4 +- 12 files changed, 235 insertions(+), 40 deletions(-) create mode 100644 api/deployments/models/component_deployment_builder.go diff --git a/api/deployments/deployment_handler.go b/api/deployments/deployment_handler.go index 7a02c29d..619c69ae 100644 --- a/api/deployments/deployment_handler.go +++ b/api/deployments/deployment_handler.go @@ -14,6 +14,7 @@ import ( "github.com/equinor/radix-operator/pkg/apis/kube" v1 "github.com/equinor/radix-operator/pkg/apis/radix/v1" operatorUtils "github.com/equinor/radix-operator/pkg/apis/utils" + radixLabels "github.com/equinor/radix-operator/pkg/apis/utils/labels" radixlabels "github.com/equinor/radix-operator/pkg/apis/utils/labels" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -28,7 +29,8 @@ type DeployHandler interface { GetComponentsForDeploymentName(ctx context.Context, appName, deploymentID string) ([]*deploymentModels.Component, error) GetComponentsForDeployment(ctx context.Context, appName string, deployment *deploymentModels.DeploymentSummary) ([]*deploymentModels.Component, error) GetLatestDeploymentForApplicationEnvironment(ctx context.Context, appName, environment string) (*deploymentModels.DeploymentSummary, error) - GetDeploymentsForJob(ctx context.Context, appName, jobName string) ([]*deploymentModels.DeploymentSummary, error) + GetDeploymentsForPipelineJob(context.Context, string, string) ([]*deploymentModels.DeploymentSummary, error) + GetDeploymentsForJobComponent(context.Context, string, string, string) ([]*deploymentModels.ComponentDeploymentSummary, error) } // DeployHandler Instance variables @@ -105,8 +107,8 @@ func (deploy *deployHandler) GetDeploymentsForApplicationEnvironment(ctx context return deployments, err } -// GetDeploymentsForJob Lists deployments for job name -func (deploy *deployHandler) GetDeploymentsForJob(ctx context.Context, appName, jobName string) ([]*deploymentModels.DeploymentSummary, error) { +// GetDeploymentsForPipelineJob Lists deployments for pipeline job name +func (deploy *deployHandler) GetDeploymentsForPipelineJob(ctx context.Context, appName, jobName string) ([]*deploymentModels.DeploymentSummary, error) { environments, err := deploy.getEnvironmentNames(ctx, appName) if err != nil { return nil, err @@ -115,6 +117,34 @@ func (deploy *deployHandler) GetDeploymentsForJob(ctx context.Context, appName, return deploy.getDeployments(ctx, appName, environments, jobName, false) } +// GetDeploymentsForJobComponent Lists deployments for application job component name +func (deploy *deployHandler) GetDeploymentsForJobComponent(ctx context.Context, appName, environment, componentName string) ([]*deploymentModels.ComponentDeploymentSummary, error) { + ns := operatorUtils.GetEnvironmentNamespace(appName, environment) + radixDeploymentList, err := deploy.accounts.UserAccount.RadixClient.RadixV1().RadixDeployments(ns).List(ctx, metav1.ListOptions{LabelSelector: radixLabels.Merge( + radixLabels.ForApplicationName(appName), radixLabels.ForEnvironmentName(environment)).String()}) + if err != nil { + return nil, err + } + rds := sortRdsByActiveFromDesc(radixDeploymentList.Items) + + var deploymentSummaries []*deploymentModels.ComponentDeploymentSummary + for _, rd := range rds { + builder := deploymentModels.NewComponentDeploymentSummaryBuilder().WithRadixDeployment(&rd) + for _, jobComponent := range rd.Spec.Jobs { + if jobComponent.Name != componentName { + continue + } + summary, err := builder.WithRadixDeployComponent(&jobComponent).Build() + if err != nil { + return nil, err + } + deploymentSummaries = append(deploymentSummaries, summary) + break + } + } + return deploymentSummaries, nil +} + // GetDeploymentWithName Handler for GetDeploymentWithName func (deploy *deployHandler) GetDeploymentWithName(ctx context.Context, appName, deploymentName string) (*deploymentModels.Deployment, error) { // Need to list all deployments to find active to of deployment diff --git a/api/deployments/mock/deployment_handler_mock.go b/api/deployments/mock/deployment_handler_mock.go index 051c9584..5d16be5f 100644 --- a/api/deployments/mock/deployment_handler_mock.go +++ b/api/deployments/mock/deployment_handler_mock.go @@ -97,19 +97,34 @@ func (mr *MockDeployHandlerMockRecorder) GetDeploymentsForApplicationEnvironment return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeploymentsForApplicationEnvironment", reflect.TypeOf((*MockDeployHandler)(nil).GetDeploymentsForApplicationEnvironment), ctx, appName, environment, latest) } -// GetDeploymentsForJob mocks base method. -func (m *MockDeployHandler) GetDeploymentsForJob(ctx context.Context, appName, jobName string) ([]*models.DeploymentSummary, error) { +// GetDeploymentsForJobComponent mocks base method. +func (m *MockDeployHandler) GetDeploymentsForJobComponent(arg0 context.Context, arg1, arg2, arg3 string) ([]*models.ComponentDeploymentSummary, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetDeploymentsForJob", ctx, appName, jobName) + ret := m.ctrl.Call(m, "GetDeploymentsForJobComponent", arg0, arg1, arg2, arg3) + ret0, _ := ret[0].([]*models.ComponentDeploymentSummary) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetDeploymentsForJobComponent indicates an expected call of GetDeploymentsForJobComponent. +func (mr *MockDeployHandlerMockRecorder) GetDeploymentsForJobComponent(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeploymentsForJobComponent", reflect.TypeOf((*MockDeployHandler)(nil).GetDeploymentsForJobComponent), arg0, arg1, arg2, arg3) +} + +// GetDeploymentsForPipelineJob mocks base method. +func (m *MockDeployHandler) GetDeploymentsForPipelineJob(arg0 context.Context, arg1, arg2 string) ([]*models.DeploymentSummary, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetDeploymentsForPipelineJob", arg0, arg1, arg2) ret0, _ := ret[0].([]*models.DeploymentSummary) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetDeploymentsForJob indicates an expected call of GetDeploymentsForJob. -func (mr *MockDeployHandlerMockRecorder) GetDeploymentsForJob(ctx, appName, jobName interface{}) *gomock.Call { +// GetDeploymentsForPipelineJob indicates an expected call of GetDeploymentsForPipelineJob. +func (mr *MockDeployHandlerMockRecorder) GetDeploymentsForPipelineJob(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeploymentsForJob", reflect.TypeOf((*MockDeployHandler)(nil).GetDeploymentsForJob), ctx, appName, jobName) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeploymentsForPipelineJob", reflect.TypeOf((*MockDeployHandler)(nil).GetDeploymentsForPipelineJob), arg0, arg1, arg2) } // GetLatestDeploymentForApplicationEnvironment mocks base method. diff --git a/api/deployments/models/component_deployment_builder.go b/api/deployments/models/component_deployment_builder.go new file mode 100644 index 00000000..40296310 --- /dev/null +++ b/api/deployments/models/component_deployment_builder.go @@ -0,0 +1,50 @@ +package models + +import ( + "fmt" + radixutils "github.com/equinor/radix-common/utils" + "github.com/equinor/radix-operator/pkg/apis/kube" + v1 "github.com/equinor/radix-operator/pkg/apis/radix/v1" +) + +// ComponentDeploymentSummaryBuilder Builds DTOs +type ComponentDeploymentSummaryBuilder interface { + WithRadixDeployment(*v1.RadixDeployment) ComponentDeploymentSummaryBuilder + WithRadixDeployComponent(component v1.RadixCommonDeployComponent) ComponentDeploymentSummaryBuilder + Build() (*ComponentDeploymentSummary, error) +} + +type componentDeploymentSummaryBuilder struct { + component v1.RadixCommonDeployComponent + radixDeployment *v1.RadixDeployment +} + +// NewComponentDeploymentSummaryBuilder Constructor for application ComponentDeploymentSummaryBuilder +func NewComponentDeploymentSummaryBuilder() ComponentDeploymentSummaryBuilder { + return &componentDeploymentSummaryBuilder{} +} + +// WithRadixDeployComponent With RadixDeployComponent +func (b *componentDeploymentSummaryBuilder) WithRadixDeployComponent(component v1.RadixCommonDeployComponent) ComponentDeploymentSummaryBuilder { + b.component = component + return b +} + +func (b *componentDeploymentSummaryBuilder) WithRadixDeployment(rd *v1.RadixDeployment) ComponentDeploymentSummaryBuilder { + b.radixDeployment = rd + return b +} + +func (b *componentDeploymentSummaryBuilder) Build() (*ComponentDeploymentSummary, error) { + if b.component == nil || b.radixDeployment == nil { + return nil, fmt.Errorf("component or RadixDeployment are empty") + } + return &ComponentDeploymentSummary{ + Name: b.radixDeployment.GetName(), + ComponentName: b.component.GetName(), + ActiveFrom: radixutils.FormatTimestamp(b.radixDeployment.Status.ActiveFrom.Time), + ActiveTo: radixutils.FormatTimestamp(b.radixDeployment.Status.ActiveTo.Time), + Condition: string(b.radixDeployment.Status.Condition), + GitCommitHash: b.radixDeployment.GetLabels()[kube.RadixCommitLabel], + }, nil +} diff --git a/api/deployments/models/deployment_summary.go b/api/deployments/models/deployment_summary.go index 6dd7de6d..9fe71a90 100644 --- a/api/deployments/models/deployment_summary.go +++ b/api/deployments/models/deployment_summary.go @@ -72,3 +72,41 @@ type DeploymentSummary struct { // example: "v1.22.1 v1.22.3" GitTags string `json:"gitTags,omitempty"` } + +// ComponentDeploymentSummary describe a component deployment +// swagger:model ComponentDeploymentSummary +type ComponentDeploymentSummary struct { + // Name the unique name of the Radix application deployment + // + // required: true + // example: radix-canary-golang-tzbqi + Name string `json:"name"` + + // Name of the component + // + // required: true + ComponentName string `json:"componentName"` + + // ActiveFrom Timestamp when the deployment starts (or created) + // + // required: true + // example: 2006-01-02T15:04:05Z + ActiveFrom string `json:"activeFrom"` + + // ActiveTo Timestamp when the deployment ends + // + // required: false + // example: 2006-01-02T15:04:05Z + ActiveTo string `json:"activeTo,omitempty"` + + // GitCommitHash the hash of the git commit from which radixconfig.yaml was parsed + // + // required: false + // example: 4faca8595c5283a9d0f17a623b9255a0d9866a2e + GitCommitHash string `json:"gitCommitHash,omitempty"` + + // Condition the condition of the component + // + // required: false + Condition string `json:"condition,omitempty"` +} diff --git a/api/environments/environment_controller.go b/api/environments/environment_controller.go index fc88203c..8c04d27f 100644 --- a/api/environments/environment_controller.go +++ b/api/environments/environment_controller.go @@ -128,6 +128,11 @@ func (c *environmentController) GetRoutes() models.Routes { Method: "GET", HandlerFunc: c.GetOAuthAuxiliaryResourcePodLog, }, + models.Route{ + Path: rootPath + "/environments/{envName}/jobcomponents/{jobComponentName}/deployments", + Method: "GET", + HandlerFunc: c.GetJobComponentRadixDeployments, + }, models.Route{ Path: rootPath + "/environments/{envName}/jobcomponents/{jobComponentName}/jobs", Method: "GET", @@ -1212,6 +1217,63 @@ func (c *environmentController) GetScheduledJobLog(accounts models.Accounts, w h } } +// GetJobComponentRadixDeployments Get list of RadixDeployments for the job component +func (c *environmentController) GetJobComponentRadixDeployments(accounts models.Accounts, w http.ResponseWriter, r *http.Request) { + // swagger:operation GET /applications/{appName}/environments/{envName}/jobcomponents/{jobComponentName}/deployments job GetJobComponentRadixDeployments + // --- + // summary: Get list of RadixDeployments for the job component + // parameters: + // - name: appName + // in: path + // description: Name of application + // type: string + // required: true + // - name: envName + // in: path + // description: Name of environment + // type: string + // required: true + // - name: jobComponentName + // in: path + // description: Name of job-component + // type: string + // required: true + // - name: Impersonate-User + // in: header + // description: Works only with custom setup of cluster. Allow impersonation of test users (Required if Impersonate-Group is set) + // type: string + // required: false + // - name: Impersonate-Group + // in: header + // description: Works only with custom setup of cluster. Allow impersonation of test group (Required if Impersonate-User is set) + // type: array + // items: + // type: string + // required: false + // responses: + // "200": + // description: "Radix component deployments" + // schema: + // type: array + // items: + // "$ref": "#/definitions/ComponentDeploymentSummary" + // "404": + // description: "Not found" + appName := mux.Vars(r)["appName"] + envName := mux.Vars(r)["envName"] + jobComponentName := mux.Vars(r)["jobComponentName"] + + eh := c.environmentHandlerFactory(accounts) + jobComponentDeployments, err := eh.deployHandler.GetDeploymentsForJobComponent(r.Context(), appName, envName, jobComponentName) + + if err != nil { + radixhttp.ErrorResponse(w, r, err) + return + } + + radixhttp.JSONResponse(w, r, jobComponentDeployments) +} + // GetJobs Get list of scheduled jobs func (c *environmentController) GetJobs(accounts models.Accounts, w http.ResponseWriter, r *http.Request) { // swagger:operation GET /applications/{appName}/environments/{envName}/jobcomponents/{jobComponentName}/jobs job getJobs diff --git a/api/environments/environment_controller_secrets_test.go b/api/environments/environment_controller_secrets_test.go index 9fa27c26..dfdfdc47 100644 --- a/api/environments/environment_controller_secrets_test.go +++ b/api/environments/environment_controller_secrets_test.go @@ -18,7 +18,7 @@ import ( secretModels "github.com/equinor/radix-api/api/secrets/models" "github.com/equinor/radix-api/api/secrets/suffix" controllertest "github.com/equinor/radix-api/api/test" - "github.com/equinor/radix-api/api/utils/tlsvalidator/mock" + tlsvalidatormock "github.com/equinor/radix-api/api/utils/tlsvalidator/mock" "github.com/equinor/radix-common/utils" "github.com/equinor/radix-common/utils/pointers" operatordefaults "github.com/equinor/radix-operator/pkg/apis/defaults" @@ -823,7 +823,7 @@ func Test_ExternalDnsAliasSecretTestSuite(t *testing.T) { type externalDnsAliasSecretTestSuite struct { suite.Suite - tlsValidator *mock.MockTLSSecretValidator + tlsValidator *tlsvalidatormock.MockInterface commonTestUtils *commontest.Utils envvironmentTestUtils *controllertest.Utils kubeClient kubernetes.Interface @@ -867,7 +867,7 @@ func (s *externalDnsAliasSecretTestSuite) buildCertificate(certCN, issuerCN stri func (s *externalDnsAliasSecretTestSuite) SetupTest() { ctrl := gomock.NewController(s.T()) - s.tlsValidator = mock.NewMockTLSSecretValidator(ctrl) + s.tlsValidator = tlsvalidatormock.NewMockInterface(ctrl) s.commonTestUtils, s.envvironmentTestUtils, _, s.kubeClient, s.radixClient, _, s.secretProviderClient = setupTest([]EnvironmentHandlerOptions{WithTLSSecretValidator(s.tlsValidator)}) s.appName, s.componentName, s.environmentName, s.alias = "any-app", "backend", "dev", "cdn.myalias.com" diff --git a/api/environments/utils.go b/api/environments/utils.go index 8852a782..dc012c6c 100644 --- a/api/environments/utils.go +++ b/api/environments/utils.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func (eh EnvironmentHandler) getRadixDeployment(ctx context.Context, appName string, envName string) (*deploymentModels.DeploymentSummary, *v1.RadixDeployment, error) { +func (eh EnvironmentHandler) getRadixDeployment(ctx context.Context, appName, envName string) (*deploymentModels.DeploymentSummary, *v1.RadixDeployment, error) { envNs := operatorutils.GetEnvironmentNamespace(appName, envName) deploymentSummary, err := eh.deployHandler.GetLatestDeploymentForApplicationEnvironment(ctx, appName, envName) if err != nil { diff --git a/api/jobs/job_handler.go b/api/jobs/job_handler.go index 50ddcdf4..fb87e746 100644 --- a/api/jobs/job_handler.go +++ b/api/jobs/job_handler.go @@ -77,7 +77,7 @@ func (jh JobHandler) GetApplicationJob(ctx context.Context, appName, jobName str return nil, err } - jobDeployments, err := jh.deploy.GetDeploymentsForJob(ctx, appName, jobName) + jobDeployments, err := jh.deploy.GetDeploymentsForPipelineJob(ctx, appName, jobName) if err != nil { return nil, err } @@ -209,7 +209,7 @@ func getPipelineRunTaskModelByTaskSpec(pipelineRun *v1beta1.PipelineRun, taskRun } } logEmbeddedCommandIndex := strings.Index(pipelineTaskModel.StatusMessage, "for logs run") - if logEmbeddedCommandIndex >= 0 { //Avoid to publish kubectl command, provided by Tekton component after "for logs run" prefix for failed task step + if logEmbeddedCommandIndex >= 0 { // Avoid to publish kubectl command, provided by Tekton component after "for logs run" prefix for failed task step pipelineTaskModel.StatusMessage = pipelineTaskModel.StatusMessage[0:logEmbeddedCommandIndex] } return &pipelineTaskModel diff --git a/api/jobs/job_handler_test.go b/api/jobs/job_handler_test.go index f9578e05..0dc08c1e 100644 --- a/api/jobs/job_handler_test.go +++ b/api/jobs/job_handler_test.go @@ -119,12 +119,12 @@ func (s *JobHandlerTestSuite) Test_GetApplicationJob() { s.Nil(actualJob) }) - s.Run("deployHandle.GetDeploymentsForJob return error", func() { + s.Run("deployHandle.GetDeploymentsForPipelineJob return error", func() { ctrl := gomock.NewController(s.T()) defer ctrl.Finish() dh := deployMock.NewMockDeployHandler(ctrl) - dh.EXPECT().GetDeploymentsForJob(context.Background(), appName, jobName).Return(nil, assert.AnError).Times(1) + dh.EXPECT().GetDeploymentsForPipelineJob(context.Background(), appName, jobName).Return(nil, assert.AnError).Times(1) h := Init(s.accounts, dh) actualJob, actualErr := h.GetApplicationJob(context.Background(), appName, jobName) @@ -138,7 +138,7 @@ func (s *JobHandlerTestSuite) Test_GetApplicationJob() { deployList := []*deploymentModels.DeploymentSummary{&deploySummary} dh := deployMock.NewMockDeployHandler(ctrl) - dh.EXPECT().GetDeploymentsForJob(context.Background(), appName, jobName).Return(deployList, nil).Times(1) + dh.EXPECT().GetDeploymentsForPipelineJob(context.Background(), appName, jobName).Return(deployList, nil).Times(1) h := Init(s.accounts, dh) actualJob, actualErr := h.GetApplicationJob(context.Background(), appName, jobName) @@ -181,7 +181,7 @@ func (s *JobHandlerTestSuite) Test_GetApplicationJob_Created() { defer ctrl.Finish() dh := deployMock.NewMockDeployHandler(ctrl) - dh.EXPECT().GetDeploymentsForJob(context.Background(), gomock.Any(), gomock.Any()).Return(nil, nil).Times(1) + dh.EXPECT().GetDeploymentsForPipelineJob(context.Background(), gomock.Any(), gomock.Any()).Return(nil, nil).Times(1) h := Init(s.accounts, dh) rj := v1.RadixJob{ObjectMeta: metav1.ObjectMeta{Name: scenario.jobName, Namespace: utils.GetAppNamespace(appName), CreationTimestamp: scenario.creationTimestamp}} if scenario.jobStatusCreated != emptyTime { @@ -212,7 +212,7 @@ func (s *JobHandlerTestSuite) Test_GetApplicationJob_Status() { defer ctrl.Finish() dh := deployMock.NewMockDeployHandler(ctrl) - dh.EXPECT().GetDeploymentsForJob(context.Background(), gomock.Any(), gomock.Any()).Return(nil, nil).Times(1) + dh.EXPECT().GetDeploymentsForPipelineJob(context.Background(), gomock.Any(), gomock.Any()).Return(nil, nil).Times(1) h := Init(s.accounts, dh) rj := v1.RadixJob{ ObjectMeta: metav1.ObjectMeta{Name: scenario.jobName, Namespace: utils.GetAppNamespace(appName)}, diff --git a/api/utils/tlsvalidator/mock/tls_secret_validator_mock.go b/api/utils/tlsvalidator/mock/tls_secret_validator_mock.go index d6bbbd83..059c0ba0 100644 --- a/api/utils/tlsvalidator/mock/tls_secret_validator_mock.go +++ b/api/utils/tlsvalidator/mock/tls_secret_validator_mock.go @@ -10,31 +10,31 @@ import ( gomock "github.com/golang/mock/gomock" ) -// MockTLSSecretValidator is a mock of TLSSecretValidator interface. -type MockTLSSecretValidator struct { +// MockInterface is a mock of Interface interface. +type MockInterface struct { ctrl *gomock.Controller - recorder *MockTLSSecretValidatorMockRecorder + recorder *MockInterfaceMockRecorder } -// MockTLSSecretValidatorMockRecorder is the mock recorder for MockTLSSecretValidator. -type MockTLSSecretValidatorMockRecorder struct { - mock *MockTLSSecretValidator +// MockInterfaceMockRecorder is the mock recorder for MockInterface. +type MockInterfaceMockRecorder struct { + mock *MockInterface } -// NewMockTLSSecretValidator creates a new mock instance. -func NewMockTLSSecretValidator(ctrl *gomock.Controller) *MockTLSSecretValidator { - mock := &MockTLSSecretValidator{ctrl: ctrl} - mock.recorder = &MockTLSSecretValidatorMockRecorder{mock} +// NewMockInterface creates a new mock instance. +func NewMockInterface(ctrl *gomock.Controller) *MockInterface { + mock := &MockInterface{ctrl: ctrl} + mock.recorder = &MockInterfaceMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockTLSSecretValidator) EXPECT() *MockTLSSecretValidatorMockRecorder { +func (m *MockInterface) EXPECT() *MockInterfaceMockRecorder { return m.recorder } // ValidateTLSCertificate mocks base method. -func (m *MockTLSSecretValidator) ValidateTLSCertificate(certBytes, keyBytes []byte, dnsName string) (bool, []string) { +func (m *MockInterface) ValidateTLSCertificate(certBytes, keyBytes []byte, dnsName string) (bool, []string) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ValidateTLSCertificate", certBytes, keyBytes, dnsName) ret0, _ := ret[0].(bool) @@ -43,13 +43,13 @@ func (m *MockTLSSecretValidator) ValidateTLSCertificate(certBytes, keyBytes []by } // ValidateTLSCertificate indicates an expected call of ValidateTLSCertificate. -func (mr *MockTLSSecretValidatorMockRecorder) ValidateTLSCertificate(certBytes, keyBytes, dnsName interface{}) *gomock.Call { +func (mr *MockInterfaceMockRecorder) ValidateTLSCertificate(certBytes, keyBytes, dnsName interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateTLSCertificate", reflect.TypeOf((*MockTLSSecretValidator)(nil).ValidateTLSCertificate), certBytes, keyBytes, dnsName) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateTLSCertificate", reflect.TypeOf((*MockInterface)(nil).ValidateTLSCertificate), certBytes, keyBytes, dnsName) } // ValidateTLSKey mocks base method. -func (m *MockTLSSecretValidator) ValidateTLSKey(keyBytes []byte) (bool, []string) { +func (m *MockInterface) ValidateTLSKey(keyBytes []byte) (bool, []string) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ValidateTLSKey", keyBytes) ret0, _ := ret[0].(bool) @@ -58,7 +58,7 @@ func (m *MockTLSSecretValidator) ValidateTLSKey(keyBytes []byte) (bool, []string } // ValidateTLSKey indicates an expected call of ValidateTLSKey. -func (mr *MockTLSSecretValidatorMockRecorder) ValidateTLSKey(keyBytes interface{}) *gomock.Call { +func (mr *MockInterfaceMockRecorder) ValidateTLSKey(keyBytes interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateTLSKey", reflect.TypeOf((*MockTLSSecretValidator)(nil).ValidateTLSKey), keyBytes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateTLSKey", reflect.TypeOf((*MockInterface)(nil).ValidateTLSKey), keyBytes) } diff --git a/go.mod b/go.mod index 7bfb1c06..27c129fa 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/equinor/radix-common v1.3.0 github.com/equinor/radix-job-scheduler v1.7.10 - github.com/equinor/radix-operator v1.39.0 + github.com/equinor/radix-operator v1.99.1000-0.20230713082445-e4d6b0916283 github.com/evanphx/json-patch/v5 v5.6.0 github.com/go-openapi/errors v0.20.3 github.com/go-openapi/strfmt v0.21.7 diff --git a/go.sum b/go.sum index cd650d8f..a6a2569b 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/equinor/radix-common v1.3.0 h1:ud2AofqF8ukCm9t1bUz+CCidRYG9Yh8g6myLWl github.com/equinor/radix-common v1.3.0/go.mod h1:E0gZfGfr8MNj1zuzjgyf1oV+1pry1VNmNZP8TscTq7U= github.com/equinor/radix-job-scheduler v1.7.10 h1:V9gcWEy5vfldsfvmfDqLsTe2nD3Yp2+XAC9dMB9Zrjg= github.com/equinor/radix-job-scheduler v1.7.10/go.mod h1:a0aRY1vOB34fabTTueaYapdAcb0FKjZSDBNcm8wJn6A= -github.com/equinor/radix-operator v1.39.0 h1:sWTdYc3JReT6dgz051Vvf4cnJ2bkxkpNVzklECUWXjg= -github.com/equinor/radix-operator v1.39.0/go.mod h1:Xvl+5C6BJi5RTyJ0P5ZfwzsHcUG1KDiOOb5OOZJib2Q= +github.com/equinor/radix-operator v1.99.1000-0.20230713082445-e4d6b0916283 h1:2X+MJzThKw6cOoBUhWDlWHWh+2QYluFY5PZd9s3EaE4= +github.com/equinor/radix-operator v1.99.1000-0.20230713082445-e4d6b0916283/go.mod h1:Xvl+5C6BJi5RTyJ0P5ZfwzsHcUG1KDiOOb5OOZJib2Q= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=