diff --git a/bootstrapper/initproto/init.pb.go b/bootstrapper/initproto/init.pb.go index 5ce2213ae..c175eb734 100644 --- a/bootstrapper/initproto/init.pb.go +++ b/bootstrapper/initproto/init.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: bootstrapper/initproto/init.proto diff --git a/debugd/internal/debugd/deploy/systemdaction_string.go b/debugd/internal/debugd/deploy/systemdaction_string.go index a25529284..203f76299 100644 --- a/debugd/internal/debugd/deploy/systemdaction_string.go +++ b/debugd/internal/debugd/deploy/systemdaction_string.go @@ -20,8 +20,9 @@ const _SystemdAction_name = "UnknownStartStopRestartReload" var _SystemdAction_index = [...]uint8{0, 7, 12, 16, 23, 29} func (i SystemdAction) String() string { - if i >= SystemdAction(len(_SystemdAction_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_SystemdAction_index)-1 { return "SystemdAction(" + strconv.FormatInt(int64(i), 10) + ")" } - return _SystemdAction_name[_SystemdAction_index[i]:_SystemdAction_index[i+1]] + return _SystemdAction_name[_SystemdAction_index[idx]:_SystemdAction_index[idx+1]] } diff --git a/debugd/service/debugd.pb.go b/debugd/service/debugd.pb.go index 8414c895f..439d33d99 100644 --- a/debugd/service/debugd.pb.go +++ b/debugd/service/debugd.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: debugd/service/debugd.proto diff --git a/disk-mapper/recoverproto/recover.pb.go b/disk-mapper/recoverproto/recover.pb.go index cf62209b3..e70136e1f 100644 --- a/disk-mapper/recoverproto/recover.pb.go +++ b/disk-mapper/recoverproto/recover.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: disk-mapper/recoverproto/recover.proto diff --git a/go.mod b/go.mod index ab256d1b6..1f7aa5e2f 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,6 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.4.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2 github.com/BurntSushi/toml v1.5.0 - github.com/aws/aws-sdk-go v1.55.8 github.com/aws/aws-sdk-go-v2 v1.39.2 github.com/aws/aws-sdk-go-v2/config v1.31.12 github.com/aws/aws-sdk-go-v2/credentials v1.18.16 @@ -88,9 +87,9 @@ require ( github.com/hashicorp/hcl/v2 v2.24.0 github.com/hashicorp/terraform-exec v0.24.0 github.com/hashicorp/terraform-json v0.27.2 - github.com/hashicorp/terraform-plugin-framework v1.16.1 - github.com/hashicorp/terraform-plugin-framework-validators v0.19.0 - github.com/hashicorp/terraform-plugin-go v0.29.0 + github.com/hashicorp/terraform-plugin-framework v1.15.1 + github.com/hashicorp/terraform-plugin-framework-validators v0.18.0 + github.com/hashicorp/terraform-plugin-go v0.28.0 github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-testing v1.13.3 github.com/hexops/gotextdiff v1.0.3 @@ -179,6 +178,7 @@ require ( github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/aws/aws-sdk-go v1.55.8 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect @@ -367,7 +367,7 @@ require ( github.com/vtolstov/go-ioctl v0.0.0-20151206205506-6be9cced4810 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect - github.com/zclconf/go-cty v1.16.4 // indirect + github.com/zclconf/go-cty v1.17.0 // indirect github.com/zeebo/errs v1.4.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect diff --git a/go.sum b/go.sum index dbfa4cab0..998b6a743 100644 --- a/go.sum +++ b/go.sum @@ -535,12 +535,12 @@ github.com/hashicorp/terraform-exec v0.24.0 h1:mL0xlk9H5g2bn0pPF6JQZk5YlByqSqrO5 github.com/hashicorp/terraform-exec v0.24.0/go.mod h1:lluc/rDYfAhYdslLJQg3J0oDqo88oGQAdHR+wDqFvo4= github.com/hashicorp/terraform-json v0.27.2 h1:BwGuzM6iUPqf9JYM/Z4AF1OJ5VVJEEzoKST/tRDBJKU= github.com/hashicorp/terraform-json v0.27.2/go.mod h1:GzPLJ1PLdUG5xL6xn1OXWIjteQRT2CNT9o/6A9mi9hE= -github.com/hashicorp/terraform-plugin-framework v1.16.1 h1:1+zwFm3MEqd/0K3YBB2v9u9DtyYHyEuhVOfeIXbteWA= -github.com/hashicorp/terraform-plugin-framework v1.16.1/go.mod h1:0xFOxLy5lRzDTayc4dzK/FakIgBhNf/lC4499R9cV4Y= -github.com/hashicorp/terraform-plugin-framework-validators v0.19.0 h1:Zz3iGgzxe/1XBkooZCewS0nJAaCFPFPHdNJd8FgE4Ow= -github.com/hashicorp/terraform-plugin-framework-validators v0.19.0/go.mod h1:GBKTNGbGVJohU03dZ7U8wHqc2zYnMUawgCN+gC0itLc= -github.com/hashicorp/terraform-plugin-go v0.29.0 h1:1nXKl/nSpaYIUBU1IG/EsDOX0vv+9JxAltQyDMpq5mU= -github.com/hashicorp/terraform-plugin-go v0.29.0/go.mod h1:vYZbIyvxyy0FWSmDHChCqKvI40cFTDGSb3D8D70i9GM= +github.com/hashicorp/terraform-plugin-framework v1.15.1 h1:2mKDkwb8rlx/tvJTlIcpw0ykcmvdWv+4gY3SIgk8Pq8= +github.com/hashicorp/terraform-plugin-framework v1.15.1/go.mod h1:hxrNI/GY32KPISpWqlCoTLM9JZsGH3CyYlir09bD/fI= +github.com/hashicorp/terraform-plugin-framework-validators v0.18.0 h1:OQnlOt98ua//rCw+QhBbSqfW3QbwtVrcdWeQN5gI3Hw= +github.com/hashicorp/terraform-plugin-framework-validators v0.18.0/go.mod h1:lZvZvagw5hsJwuY7mAY6KUz45/U6fiDR0CzQAwWD0CA= +github.com/hashicorp/terraform-plugin-go v0.28.0 h1:zJmu2UDwhVN0J+J20RE5huiF3XXlTYVIleaevHZgKPA= +github.com/hashicorp/terraform-plugin-go v0.28.0/go.mod h1:FDa2Bb3uumkTGSkTFpWSOwWJDwA7bf3vdP3ltLDTH6o= github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0= github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM= @@ -841,8 +841,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zalando/go-keyring v0.2.3 h1:v9CUu9phlABObO4LPWycf+zwMG7nlbb3t/B5wa97yms= github.com/zalando/go-keyring v0.2.3/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk= -github.com/zclconf/go-cty v1.16.4 h1:QGXaag7/7dCzb+odlGrgr+YmYZFaOCMW6DEpS+UD1eE= -github.com/zclconf/go-cty v1.16.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.17.0 h1:seZvECve6XX4tmnvRzWtJNHdscMtYEx5R7bnnVyd/d0= +github.com/zclconf/go-cty v1.17.0/go.mod h1:wqFzcImaLTI6A5HfsRwB0nj5n0MRZFwmey8YoFPPs3U= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM= diff --git a/internal/api/attestationconfigapi/cli/client/BUILD.bazel b/internal/api/attestationconfigapi/cli/client/BUILD.bazel index c90cb34b9..3200c3df8 100644 --- a/internal/api/attestationconfigapi/cli/client/BUILD.bazel +++ b/internal/api/attestationconfigapi/cli/client/BUILD.bazel @@ -15,7 +15,6 @@ go_library( "//internal/attestation/variant", "//internal/sigstore", "//internal/staticupload", - "@com_github_aws_aws_sdk_go//aws", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", ], ) diff --git a/internal/api/attestationconfigapi/cli/client/client.go b/internal/api/attestationconfigapi/cli/client/client.go index ea867dd1c..9f0166761 100644 --- a/internal/api/attestationconfigapi/cli/client/client.go +++ b/internal/api/attestationconfigapi/cli/client/client.go @@ -19,7 +19,6 @@ import ( "strings" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/aws/aws-sdk-go/aws" "github.com/edgelesssys/constellation/v2/internal/api/attestationconfigapi" apiclient "github.com/edgelesssys/constellation/v2/internal/api/client" "github.com/edgelesssys/constellation/v2/internal/attestation/variant" @@ -112,8 +111,8 @@ func (c Client) deleteVersion(versions attestationconfigapi.List, versionStr str func (c Client) listCachedVersions(ctx context.Context, attestation variant.Variant) ([]string, error) { list, err := c.s3Client.ListObjectsV2(ctx, &s3.ListObjectsV2Input{ - Bucket: aws.String(c.bucketID), - Prefix: aws.String(reportVersionDir(attestation)), + Bucket: toPtr(c.bucketID), + Prefix: toPtr(reportVersionDir(attestation)), }) if err != nil { return nil, fmt.Errorf("list objects: %w", err) @@ -176,3 +175,7 @@ func executeAllCmds(ctx context.Context, client *apiclient.Client, cmds []crudCm } return nil } + +func toPtr(s string) *string { + return &s +} diff --git a/internal/attestation/idkeydigest/enforcement_string.go b/internal/attestation/idkeydigest/enforcement_string.go index 333a76ebb..c8a77b9d0 100644 --- a/internal/attestation/idkeydigest/enforcement_string.go +++ b/internal/attestation/idkeydigest/enforcement_string.go @@ -19,8 +19,9 @@ const _Enforcement_name = "UnknownEqualMAAFallbackWarnOnly" var _Enforcement_index = [...]uint8{0, 7, 12, 23, 31} func (i Enforcement) String() string { - if i >= Enforcement(len(_Enforcement_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_Enforcement_index)-1 { return "Enforcement(" + strconv.FormatInt(int64(i), 10) + ")" } - return _Enforcement_name[_Enforcement_index[i]:_Enforcement_index[i+1]] + return _Enforcement_name[_Enforcement_index[idx]:_Enforcement_index[idx+1]] } diff --git a/internal/cloud/azureshared/authmethod_string.go b/internal/cloud/azureshared/authmethod_string.go index 11b224d01..149df2680 100644 --- a/internal/cloud/azureshared/authmethod_string.go +++ b/internal/cloud/azureshared/authmethod_string.go @@ -18,8 +18,9 @@ const _AuthMethod_name = "UnknownServicePrincipalUserAssignedIdentity" var _AuthMethod_index = [...]uint8{0, 7, 23, 43} func (i AuthMethod) String() string { - if i >= AuthMethod(len(_AuthMethod_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_AuthMethod_index)-1 { return "AuthMethod(" + strconv.FormatInt(int64(i), 10) + ")" } - return _AuthMethod_name[_AuthMethod_index[i]:_AuthMethod_index[i+1]] + return _AuthMethod_name[_AuthMethod_index[idx]:_AuthMethod_index[idx+1]] } diff --git a/internal/cloud/cloudprovider/provider_string.go b/internal/cloud/cloudprovider/provider_string.go index f6b1fba8e..65b74157f 100644 --- a/internal/cloud/cloudprovider/provider_string.go +++ b/internal/cloud/cloudprovider/provider_string.go @@ -21,8 +21,9 @@ const _Provider_name = "UnknownAWSAzureGCPOpenStackQEMU" var _Provider_index = [...]uint8{0, 7, 10, 15, 18, 27, 31} func (i Provider) String() string { - if i >= Provider(len(_Provider_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_Provider_index)-1 { return "Provider(" + strconv.FormatInt(int64(i), 10) + ")" } - return _Provider_name[_Provider_index[i]:_Provider_index[i+1]] + return _Provider_name[_Provider_index[idx]:_Provider_index[idx+1]] } diff --git a/internal/constellation/helm/charts/coredns/templates/configmap.yaml b/internal/constellation/helm/charts/coredns/templates/configmap.yaml index 03f06d623..daf92626e 100644 --- a/internal/constellation/helm/charts/coredns/templates/configmap.yaml +++ b/internal/constellation/helm/charts/coredns/templates/configmap.yaml @@ -26,6 +26,5 @@ data: } kind: ConfigMap metadata: - creationTimestamp: null name: edg-coredns namespace: kube-system diff --git a/internal/constellation/helm/charts/coredns/templates/deployment.yaml b/internal/constellation/helm/charts/coredns/templates/deployment.yaml index b7fd735df..f8687dbb3 100644 --- a/internal/constellation/helm/charts/coredns/templates/deployment.yaml +++ b/internal/constellation/helm/charts/coredns/templates/deployment.yaml @@ -1,7 +1,6 @@ apiVersion: apps/v1 kind: Deployment metadata: - creationTimestamp: null labels: k8s-app: kube-dns name: coredns @@ -17,7 +16,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: k8s-app: kube-dns spec: @@ -43,7 +41,7 @@ spec: failureThreshold: 5 httpGet: path: /health - port: 8080 + port: liveness-probe scheme: HTTP initialDelaySeconds: 60 successThreshold: 1 @@ -59,10 +57,16 @@ spec: - containerPort: 9153 name: metrics protocol: TCP + - containerPort: 8080 + name: liveness-probe + protocol: TCP + - containerPort: 8181 + name: readiness-probe + protocol: TCP readinessProbe: httpGet: path: /ready - port: 8181 + port: readiness-probe scheme: HTTP resources: limits: diff --git a/internal/constellation/helm/charts/coredns/values.yaml b/internal/constellation/helm/charts/coredns/values.yaml index c740ed71c..ffbc8e104 100644 --- a/internal/constellation/helm/charts/coredns/values.yaml +++ b/internal/constellation/helm/charts/coredns/values.yaml @@ -1,3 +1,3 @@ clusterIP: 10.96.0.10 dnsDomain: cluster.local -image: registry.k8s.io/coredns/coredns:v1.12.0@sha256:40384aa1f5ea6bfdc77997d243aec73da05f27aed0c5e9d65bfa98933c519d97 +image: registry.k8s.io/coredns/coredns:v1.12.1@sha256:e8c262566636e6bc340ece6473b0eed193cad045384401529721ddbe6463d31c diff --git a/internal/role/role_string.go b/internal/role/role_string.go index 17e1e006d..0729fca06 100644 --- a/internal/role/role_string.go +++ b/internal/role/role_string.go @@ -18,8 +18,9 @@ const _Role_name = "UnknownControlPlaneWorker" var _Role_index = [...]uint8{0, 7, 19, 25} func (i Role) String() string { - if i >= Role(len(_Role_index)-1) { + idx := int(i) - 0 + if i < 0 || idx >= len(_Role_index)-1 { return "Role(" + strconv.FormatInt(int64(i), 10) + ")" } - return _Role_name[_Role_index[i]:_Role_index[i+1]] + return _Role_name[_Role_index[idx]:_Role_index[idx+1]] } diff --git a/internal/versions/components/components.pb.go b/internal/versions/components/components.pb.go index 5236421c8..8541aa38f 100644 --- a/internal/versions/components/components.pb.go +++ b/internal/versions/components/components.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: internal/versions/components/components.proto diff --git a/joinservice/joinproto/join.pb.go b/joinservice/joinproto/join.pb.go index a620ccbd5..fe5d9e7e2 100644 --- a/joinservice/joinproto/join.pb.go +++ b/joinservice/joinproto/join.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: joinservice/joinproto/join.proto diff --git a/keyservice/keyserviceproto/keyservice.pb.go b/keyservice/keyserviceproto/keyservice.pb.go index ee7a23ff2..9285d4311 100644 --- a/keyservice/keyserviceproto/keyservice.pb.go +++ b/keyservice/keyserviceproto/keyservice.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: keyservice/keyserviceproto/keyservice.proto diff --git a/renovate.json5 b/renovate.json5 index ec4b1f189..6cea6fa92 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -32,6 +32,12 @@ // Only update once they fixed dependency violations on their side. 'github.com/google/go-tpm-tools', 'terraform-provider-openstack/openstack', + // terraform-plugin-go v0.29.0 breaks our protobuf generation + 'github.com/hashicorp/terraform-plugin-go', + // terraform-plugin-framework v1.16.1 requires terraform-plugin-go v0.29.0 + 'github.com/hashicorp/terraform-plugin-framework', + // terraform-plugin-framework-validators v0.18.0 requires terraform-plugin-go v0.29.0 + 'github.com/hashicorp/terraform-plugin-framework-validators', ], // Rules for changing renovates behaviour for different packages. // The documentation for configuration options can be found here: diff --git a/upgrade-agent/upgradeproto/upgrade.pb.go b/upgrade-agent/upgradeproto/upgrade.pb.go index c220690cb..73aa3aff7 100644 --- a/upgrade-agent/upgradeproto/upgrade.pb.go +++ b/upgrade-agent/upgradeproto/upgrade.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: upgrade-agent/upgradeproto/upgrade.proto diff --git a/verify/verifyproto/verify.pb.go b/verify/verifyproto/verify.pb.go index e48755baa..1499f20ef 100644 --- a/verify/verifyproto/verify.pb.go +++ b/verify/verifyproto/verify.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.6 +// protoc-gen-go v1.36.10 // protoc v5.29.1 // source: verify/verifyproto/verify.proto