diff --git a/bazel/toolchains/go_module_deps.bzl b/bazel/toolchains/go_module_deps.bzl index 5479de2f8c8..3355b563b3c 100644 --- a/bazel/toolchains/go_module_deps.bzl +++ b/bazel/toolchains/go_module_deps.bzl @@ -495,14 +495,6 @@ def go_dependencies(): sum = "h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM=", version = "v0.10.0", ) - go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_keyvault_azsecrets", - build_file_generation = "on", - build_file_proto_mode = "disable_global", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets", - sum = "h1:xnO4sFyG8UH2fElBkcqLTOZsAajvKfnSlgBBW8dXYjw=", - version = "v0.12.0", - ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_keyvault_internal", build_file_generation = "on", @@ -559,6 +551,14 @@ def go_dependencies(): sum = "h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw=", version = "v1.0.1", ) + go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_security_keyvault_azsecrets", + build_file_generation = "on", + build_file_proto_mode = "disable_global", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets", + sum = "h1:h4Zxgmi9oyZL2l8jeg1iRTqPloHktywWcu0nlJmo1tA=", + version = "v1.1.0", + ) go_repository( name = "com_github_azure_azure_sdk_for_go_sdk_security_keyvault_internal", build_file_generation = "on", diff --git a/debugd/internal/debugd/logcollector/BUILD.bazel b/debugd/internal/debugd/logcollector/BUILD.bazel index 4e0f0b089c7..9fcc765b392 100644 --- a/debugd/internal/debugd/logcollector/BUILD.bazel +++ b/debugd/internal/debugd/logcollector/BUILD.bazel @@ -18,7 +18,7 @@ go_library( "@com_github_aws_aws_sdk_go_v2_config//:config", "@com_github_aws_aws_sdk_go_v2_service_secretsmanager//:secretsmanager", "@com_github_azure_azure_sdk_for_go_sdk_azidentity//:azidentity", - "@com_github_azure_azure_sdk_for_go_sdk_keyvault_azsecrets//:azsecrets", + "@com_github_azure_azure_sdk_for_go_sdk_security_keyvault_azsecrets//:azsecrets", "@com_github_googleapis_gax_go_v2//:gax-go", "@com_google_cloud_go_secretmanager//apiv1", "@com_google_cloud_go_secretmanager//apiv1/secretmanagerpb", @@ -31,7 +31,7 @@ go_test( embed = [":logcollector"], deps = [ "@com_github_aws_aws_sdk_go_v2_service_secretsmanager//:secretsmanager", - "@com_github_azure_azure_sdk_for_go_sdk_keyvault_azsecrets//:azsecrets", + "@com_github_azure_azure_sdk_for_go_sdk_security_keyvault_azsecrets//:azsecrets", "@com_github_googleapis_gax_go_v2//:gax-go", "@com_github_stretchr_testify//assert", "@com_google_cloud_go_secretmanager//apiv1/secretmanagerpb", diff --git a/debugd/internal/debugd/logcollector/credentials.go b/debugd/internal/debugd/logcollector/credentials.go index 6c017282fc8..3ada029e1b0 100644 --- a/debugd/internal/debugd/logcollector/credentials.go +++ b/debugd/internal/debugd/logcollector/credentials.go @@ -17,7 +17,7 @@ import ( gcpsecretmanager "cloud.google.com/go/secretmanager/apiv1" gcpsecretmanagerpb "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" + "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets" awsconfig "github.com/aws/aws-sdk-go-v2/config" awssecretmanager "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/info" diff --git a/debugd/internal/debugd/logcollector/credentials_test.go b/debugd/internal/debugd/logcollector/credentials_test.go index a48f5a800a8..19d113c99fe 100644 --- a/debugd/internal/debugd/logcollector/credentials_test.go +++ b/debugd/internal/debugd/logcollector/credentials_test.go @@ -13,7 +13,7 @@ import ( "testing" "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb" - "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" + "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets" awssecretmanager "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" @@ -103,7 +103,7 @@ func TestGetOpensearchCredentialsAzure(t *testing.T) { "azure success": { azureAPI: stubAzureSecretsAPI{ getSecretResp: azsecrets.GetSecretResponse{ - SecretBundle: azsecrets.SecretBundle{ + Secret: azsecrets.Secret{ Value: ptr("test-password"), }, }, diff --git a/go.mod b/go.mod index 86a925d242f..600e58dcd45 100644 --- a/go.mod +++ b/go.mod @@ -50,9 +50,9 @@ require ( github.com/Azure/azure-sdk-for-go v68.0.0+incompatible github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 - github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v5 v5.0.0 + github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 github.com/aws/aws-sdk-go v1.50.22 github.com/aws/aws-sdk-go-v2 v1.25.0 @@ -158,6 +158,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.29 // indirect diff --git a/go.sum b/go.sum index 84aa78ed6fc..aa083922b2a 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,6 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aM github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc= github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 h1:m/sWOGCREuSBqg2htVQTBY8nOZpyajYztF0vUvSZTuM= github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0/go.mod h1:Pu5Zksi2KrU7LPbZbNINx6fuVrUp/ffvpxdDj+i8LeE= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0 h1:xnO4sFyG8UH2fElBkcqLTOZsAajvKfnSlgBBW8dXYjw= -github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0/go.mod h1:XD3DIOOVgBCO03OleB1fHjgktVRFxlT++KwKgIOewdM= github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 h1:FbH3BbSb4bvGluTesZZ+ttN/MDsnMmQP36OSnDuSXqw= github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn9jDEkCkv8w/bKTNppX/d0FVA1ud77xCIP4KA= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.5.0 h1:MxA59PGoCFb+vCwRQi3PhQEwHj4+r2dhuv9HG+vM7iM= @@ -43,6 +41,10 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1. github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1/go.mod h1:c/wcGeGx5FUPbM/JltUYHZcKmigwyVLJlDq+4HdtXaw= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0 h1:h4Zxgmi9oyZL2l8jeg1iRTqPloHktywWcu0nlJmo1tA= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.1.0/go.mod h1:LgLGXawqSreJz135Elog0ywTJDsm0Hz2k+N+6ZK35u8= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= +github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 h1:IfFdxTUDiV58iZqPKgyWiz4X4fCxZeQ1pTQPImLYXpY= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0/go.mod h1:SUZc9YRRHfx2+FAQKNDGrssXehqLpxmwRv2mC/5ntj4= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=