diff --git a/.github/workflows/lint-conventional-prs.yml b/.github/workflows/lint-conventional-prs.yml index 333ebcfd..eece8e93 100644 --- a/.github/workflows/lint-conventional-prs.yml +++ b/.github/workflows/lint-conventional-prs.yml @@ -14,7 +14,7 @@ jobs: name: Lint PR Title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@47b15d52c5c30e94a17ec87eb8dd51ff5221fed9 + - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/lint-golangci.yml b/.github/workflows/lint-golangci.yml index d18fcf33..dce7db6e 100644 --- a/.github/workflows/lint-golangci.yml +++ b/.github/workflows/lint-golangci.yml @@ -17,7 +17,7 @@ jobs: go-version-file: 'go.mod' cache: false - name: golangci-lint - uses: golangci/golangci-lint-action@v6.1.0 + uses: golangci/golangci-lint-action@v6.1.1 with: version: v1.60.3 args: --verbose diff --git a/.github/workflows/test-unit-coverage.yml b/.github/workflows/test-unit-coverage.yml index 91799ec7..e2f8208c 100644 --- a/.github/workflows/test-unit-coverage.yml +++ b/.github/workflows/test-unit-coverage.yml @@ -28,7 +28,7 @@ jobs: with: path: codebase - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/codebase/go.mod - name: Run the quality gate verification diff --git a/.github/workflows/validate-docs.yml b/.github/workflows/validate-docs.yml index fffdcf46..36810201 100644 --- a/.github/workflows/validate-docs.yml +++ b/.github/workflows/validate-docs.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout modulectl uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' cache-dependency-path: 'go.sum' diff --git a/go.mod b/go.mod index 63377226..1652856e 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apiextensions-apiserver v0.31.1 - k8s.io/apimachinery v0.31.1 + k8s.io/apiextensions-apiserver v0.31.2 + k8s.io/apimachinery v0.31.2 ocm.software/ocm v0.16.2 sigs.k8s.io/yaml v1.4.0 ) @@ -324,9 +324,9 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect helm.sh/helm/v3 v3.16.1 // indirect - k8s.io/api v0.31.1 // indirect + k8s.io/api v0.31.2 // indirect k8s.io/cli-runtime v0.31.1 // indirect - k8s.io/client-go v0.31.1 // indirect + k8s.io/client-go v0.31.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect diff --git a/go.sum b/go.sum index c9bf0c18..d06035d8 100644 --- a/go.sum +++ b/go.sum @@ -1312,18 +1312,18 @@ helm.sh/helm/v3 v3.16.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c= helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= -k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= -k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= -k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= -k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= -k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= +k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0= +k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM= +k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= +k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= -k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= -k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= -k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= -k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA= +k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= diff --git a/internal/service/scaffold/scaffold_test.go b/internal/service/scaffold/scaffold_test.go index 8355b2f3..37c10a65 100644 --- a/internal/service/scaffold/scaffold_test.go +++ b/internal/service/scaffold/scaffold_test.go @@ -257,8 +257,7 @@ func newScaffoldOptionsBuilder() *scaffoldOptionsBuilder { withModuleConfigFileOverwrite(false). withSecurityConfigFileName("security-config.yaml"). withModuleName("github.com/kyma-project/test"). - withModuleVersion("0.0.1"). - withModuleChannel("experimental") + withModuleVersion("0.0.1") } func (b *scaffoldOptionsBuilder) build() scaffold.Options { @@ -309,8 +308,3 @@ func (b *scaffoldOptionsBuilder) withModuleVersion(moduleVersion string) *scaffo b.options.ModuleVersion = moduleVersion return b } - -func (b *scaffoldOptionsBuilder) withModuleChannel(moduleChannel string) *scaffoldOptionsBuilder { - b.options.ModuleChannel = moduleChannel - return b -} diff --git a/internal/service/templategenerator/templategenerator_test.go b/internal/service/templategenerator/templategenerator_test.go index a2d57dd4..74c72d8f 100644 --- a/internal/service/templategenerator/templategenerator_test.go +++ b/internal/service/templategenerator/templategenerator_test.go @@ -60,7 +60,6 @@ func TestGenerateModuleTemplate_Success(t *testing.T) { require.Equal(t, "output.yaml", mockFS.path) require.Contains(t, mockFS.writtenTemplate, "test-resource") require.Contains(t, mockFS.writtenTemplate, "default") - require.Contains(t, mockFS.writtenTemplate, "stable") require.Contains(t, mockFS.writtenTemplate, "test-data") require.Contains(t, mockFS.writtenTemplate, "example.com/component") require.Contains(t, mockFS.writtenTemplate, "someResource") @@ -118,7 +117,6 @@ func TestGenerateModuleTemplateWithAssociatedResources_Success(t *testing.T) { require.Equal(t, "output.yaml", mockFS.path) require.Contains(t, mockFS.writtenTemplate, "test-resource") require.Contains(t, mockFS.writtenTemplate, "default") - require.Contains(t, mockFS.writtenTemplate, "stable") require.Contains(t, mockFS.writtenTemplate, "test-data") require.Contains(t, mockFS.writtenTemplate, "example.com/component") require.Contains(t, mockFS.writtenTemplate, "associatedResources") @@ -156,7 +154,6 @@ func TestGenerateModuleTemplateWithManager_Success(t *testing.T) { require.Equal(t, "output.yaml", mockFS.path) require.Contains(t, mockFS.writtenTemplate, "test-resource") require.Contains(t, mockFS.writtenTemplate, "default") - require.Contains(t, mockFS.writtenTemplate, "stable") require.Contains(t, mockFS.writtenTemplate, "test-data") require.Contains(t, mockFS.writtenTemplate, "example.com/component") require.Contains(t, mockFS.writtenTemplate, "manager-name") @@ -195,7 +192,6 @@ func TestGenerateModuleTemplateWithManagerWithoutNamespace_Success(t *testing.T) require.Equal(t, "output.yaml", mockFS.path) require.Contains(t, mockFS.writtenTemplate, "test-resource") require.Contains(t, mockFS.writtenTemplate, "default") - require.Contains(t, mockFS.writtenTemplate, "stable") require.Contains(t, mockFS.writtenTemplate, "test-data") require.Contains(t, mockFS.writtenTemplate, "example.com/component") require.Contains(t, mockFS.writtenTemplate, "manager-name")