diff --git a/.github/workflows/finalize-copybara-sync.yml b/.github/workflows/finalize-copybara-sync.yml index 6c77e09f..6bc85a0f 100644 --- a/.github/workflows/finalize-copybara-sync.yml +++ b/.github/workflows/finalize-copybara-sync.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: go.mod diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3aa0b04..2477f7e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.x check-latest: true @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.x check-latest: true @@ -57,13 +57,13 @@ jobs: # block in .goreleaser.yaml). It is not preinstalled on GitHub-hosted # runners, so download it before goreleaser runs. - name: Install Syft - uses: anchore/sbom-action/download-syft@v0.24.0 + uses: anchore/sbom-action/download-syft@v0.24.2 - name: Run GoReleaser (publish) uses: goreleaser/goreleaser-action@v7 with: # renovate: datasource=github-releases depName=goreleaser/goreleaser - version: "v2.17.1" + version: "v2.18.0" args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 602ad5d0..d75edf20 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version: 1.x check-latest: true diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 3aeea92f..bb452b6e 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,70 +2,70 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "6.60.0" + version = "6.61.0" constraints = ">= 4.56.0, >= 6.39.0" hashes = [ - "h1:+TT7df3l6A6RG2XPOe98Np/m88WiYBxfjYvkMSBj6PY=", - "h1:+uxQ17wgdfSI/m9TN6R4ynL/PWo567nWyPTLpldpuOU=", - "h1:5UdlvWB6Ut0WSBEzjVX+ZGRikbIjDz8mm8+F2ULHQLM=", - "h1:6k3c7q0Wc5+O36oKiiaZqNVZ6eKk0BtaU274Smn34CE=", - "h1:7gcIr+/FNqkXMTxrOag1nkmy2BTJtO1nx5vqh0ryUfE=", - "h1:AVffai3OcsmJosvsQHQYQuEbHTzpW9ySVlP9iHmVUDM=", - "h1:BDSQlnJzI6J7VA7JmDk1gfgwVlEBWhTSVljOsxmEpOo=", - "h1:EUAcCUKQsr9fLSIeBYz0vvFwOUfdFu08wE0F178cEXY=", - "h1:JV0ioBmGtA0OiDun9I4C5lEF5cs5xZ8DTJEjztzrHmM=", - "h1:M8bTEry1yOyMR221PQTHwbCEQ3db8aezIqc4JXFmXzk=", - "h1:RYcIzSUCm0zXKn4FGoQ/LsLzBctyH7eMQTm1snD19+E=", - "h1:VF6oe4urgR2lRZuCAytMHvUZHtqcZU99TGw915LdCL0=", - "h1:aKdhZmlQi4A+18NUfL41TdCSDL94nB5hrpHUSx/bh7w=", - "h1:dVV70UYO54HbuW+tmPzgUQF2AAcRi838eGlAKra/IBw=", - "h1:w4HY6cwbEYlsn9N+r38nhx8lJeOz8vyUAUiatK8dNWw=", - "zh:1a29660d9038c38e9e306194bd3e7de7017148f3491af7fdfa434d7d8c82b3d4", - "zh:268d711a0a9c18459e09a837405244e5d459bb4ebb5d34a91c4fcbabe3e25d26", - "zh:2d7058c285484e7cccf4f5b1973c10b404ae77532f77ea95115915dd341fbf5b", - "zh:2e1cddc362497b569ba528f013d0cf770465047b8185e8180f4ccabafa082577", - "zh:5210c99d5946dd4985a6cff7460422e257037679b35df0a54982e3f675d1a8d5", - "zh:60703aa30b23ed5e5cfabf2614aeb465cf2aa4b848eb8afb2723b6b9d358ccd0", - "zh:904f0651e9bfbf08b16f4d13c85e7841c2d1b5a670087cb11f8d4ad06249cf0c", + "h1:/LR+WmjQr+mio3oxmUz0utvuk1USC0qa42+Y3dBoE44=", + "h1:AXaTGQ1/c8c8tMVlsiP1AbTvgIZYatMul9g0DYpIdJ4=", + "h1:AiZJculYPpUE0OekmDkKg6tmgMq6ZCt25qAPBLKijv0=", + "h1:F1heQs83kGhC3pN6fumtYJXd79vFaZ3dcl+ug7SfzWo=", + "h1:FkRyWTkNOPCl7qr4UmyiMfO0tsZt9SFlk66VDHajNiE=", + "h1:Ix8guxqBWKze4iYlhEQ4lckue3o2fw3QmWb6caegjow=", + "h1:Kl91YvWRdorx6POwgdFf6ZBsHHa86GhazsqOwPvunyo=", + "h1:N09EN8js6rrSP9KJ7kmYhXRA1vJfCLEwlKGVEpMxlN4=", + "h1:TEUWQnsDFXrOjdLhpLqXkOT5WF8c9XK9EealsGEXLeE=", + "h1:WfUD7cVLT7FQU3tUZweSmbSt2rnipzYUkSeGlB0vpm4=", + "h1:buFhEbeRrLbQJS0LwGjWfFvsYu0QQe8Xx3/KeRCVk0g=", + "h1:luPmlKygfw2SMKJkMQ++/J8rRR0ZgR0uJPupp8wy3pw=", + "h1:qMn+laGtva7gx59tMJ0gJgdi28N7u6TCFJgxIcYe9u0=", + "h1:vhzTI4PeOTWCJ0DgaKwkQ0IrpU0jMhDzDflgfwKqxUI=", + "h1:xgqNausjCmDbyoc3aY+flDVsUKgefbTjgKA9cQun4Ks=", + "zh:216566f0fbc506e107d3a961c87d88aed052ec2b4ced13388394d3cff30425ac", + "zh:4700ad141d0ad96465ac35a3900f2ff7c91a1e5528428ac687c8b5825c0be718", + "zh:6b79d2fa6550fc51e2fac04f1066c5cc96e957e7634ad86d2250240e637db205", + "zh:76f6227bf2bcd7422cf29d9868d8b517c8220ec3edd4e7c8434b867a71c03334", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b4268c98208f725ea28afb38dde6cb4b7536de577c36ee919fa44c3d8d5faf70", - "zh:caf78d1713cc323383facae063c61584758ea697428f328600227902f3a9980f", - "zh:cb349f8a43653bfc78867909d6342c56073f9805bdbd9dc32a8e1d18302257d4", - "zh:e087e5e6e3130980838552022e022a62a52a851cf93a0029cb5d410a34f6106b", - "zh:e94318f9ebf29d06aa821da73a7fc7a637d7d13e535e40585c6242cea4477262", - "zh:effc513566df2f5b5921a5df884817b1de57790db1c485eece566c5d4c55c4ee", - "zh:f2be12b976d10a91289835056ff962721e65f47f8e52b368211c4bd3ce9e20e6", - "zh:fb7ef7e405b05789cec32c8ea06a353789c6e3a336b876508cf2ac98984f0558", + "zh:a7be5814cf94a8e3869ec9fa7f5182223a11373a4510ce68b9bab431f9b83746", + "zh:b65392e24506fe99f8df7bd2b5d3940d7a234b64b79a890f1aabe2be91a827e5", + "zh:b68a5092203cf5a9d1a5f01f9f2e96fded3eb7cacfd49ae851c50b87bc610fe9", + "zh:b8fedfa62bac16592519e1bae0c82dd7cd1544b0637543d72e3597e46ad7db32", + "zh:bba8a35212c07e68b6c881aa011c4b26a284e42b971059579aca9ffb63a8faef", + "zh:bbd0391e3e2f21c8930872829df7cf7f4e35f84c4d6d7b7619a94f8078fe6f3d", + "zh:c9c921e8e466281c04cada8d336ec1ce978128ee153e9df7b451847fbea49d18", + "zh:c9cb0be3097f4392b977fa254d28efd0909d008f572e74a41ead6c0d84c0daaa", + "zh:cc7aeb23fa3775816e391d4668a9865f787993f9f8d6f5b7a9f7e4effdffb3cb", + "zh:e59e487220cec8999bbd120ba8f97b5e04b010fb9149e47d4c9032961614d7c7", + "zh:fa19a7571a99397120f2f2bdcf33bbcc2f39091b9b0c879cd7e5f9ebb1966c40", ] } provider "registry.terraform.io/hashicorp/google" { - version = "7.44.0" + version = "7.45.0" constraints = ">= 4.0.0" hashes = [ - "h1:8yNoTfZlinZ7cPgP41rlVPfrOz2dG04UMAWI4APTnGE=", - "h1:FbL1iJAQHoSxwQjQNxsejAAjVwTYe7U8/uryPgzBn6s=", - "h1:NqGVZh36a/xy8odgCGOE+xW3kOUlWlFHy3Oj3w6cCDA=", - "h1:PlxRO7Plo2TEIS0wJ8A9h0rV++booglbZIqCrJcVj3s=", - "h1:QEH7/0uSPLbmKp+UZVvlmwMvkBf57WDdZp3gOC/ZH1Q=", - "h1:U1jsJXYaoJktPKVmeHiXpeHZkRECBypqOC4GBLm25pg=", - "h1:UMYkIFqEeTXfMW1qDAT0klB3iJFTzQiW0l8tvRiR4po=", - "h1:bHZcTlkjny9wKOUyfH+ifPLi9kLReEZxu9Q7jfpuM68=", - "h1:j4zxF2kgznlGqB8jqIEhV+XqtQIeJ8OewHe26rOHF3A=", - "h1:jQ4YCxn0YjFHpt7UKrE/zD6RqU8GViAADXv+7rhxyoA=", - "h1:y8O1Hrj1P9zjnnh1V343klgWpfOxi4WIYOqzZAXdjK8=", - "zh:0f01a648c6f423aef3981cf5ceacbffd6da7c4cea09ee32281e1b8d097dea450", - "zh:466c2115c5ec2e28db03e2c5ee167b58cb07fc546e57c92b7128c165ca35074b", - "zh:4d9172e50e29305b08af59d02adeaedcac019073e80959a23dac63792c27cf23", - "zh:5222149fc04cc34341efb90fdc51d8ebd8e051fdfbfd4f4eab1f2d9945c41903", - "zh:75dd7746d710a2ebf5996879e4a079df868f5144504e6e1c8593542ef00164ec", - "zh:7a6e73ccb4a4cc383fe88adcafb8f17679b292c5b6f7b6a60463823d9f7014ba", - "zh:9244f674832347c0190ecbdb22872b4ba8476c507622107c096304957680e65c", - "zh:99c53c2bb648ed96f3cbc46de9aecdaf561c8a55a4d3ead1b170fd48a69d1103", - "zh:a13bbcf868994dace18fb4be393af01fef2d5139580a8ce2a12893f1dce66e83", - "zh:b03b1e792797300bb3357116bd44438a0892d5b80c9e1e9accb06a62dc162f69", - "zh:ef0d8cb202b466520875f37b261f3e58a0f53b0f4c969ae81a006afb9158ba31", + "h1:5bwzwKa/bvJmUkVMkrF18v9AfFeJ/wjR230oY+4LHrc=", + "h1:Cvkersnum2YG1skWa7YEveKp8neT4AYy4Z6Z4qNEiBE=", + "h1:DD/fFbe/pKBcpfR3umQtSV55Nbq2vDiU1v9dq2Jr7wE=", + "h1:EYsKCMfXi6gtv3fE6XgNpsKrt7qFNrGFwenhlTkrrRM=", + "h1:FGFsRBzfeyq56BUAcb/WT676NieMX3NRfR4DBj2eEqk=", + "h1:IDuQFjfryigpcH3LAOja1GwWXoj8+W1LRAIxgzK/CDM=", + "h1:IrbpvryTMeEYnzOwDclR25AvH4iVwHceCSzSzh3axwQ=", + "h1:MTfwKEP6aTHUACoEaPpFserLeJ6EzNUyGUAXlNOZUJw=", + "h1:bavkenCqrvZ9QcFojk1EnbThAYzYlx5iuARbcRrQC0g=", + "h1:snI9jfT+CtL8dH099NZCe79ciOSTuL74nPB7KaCf9pM=", + "h1:urzr+HVOJbm0raA6D1vorhOkHAaspjoJTRiWavaiTlc=", + "zh:0f33485d068e39b1661d4ad789dfac353134b99cb5746e463e7719c053d70c06", + "zh:162335c448b15125924c3451dc0a411635138c00e36784d9586b9df61bc8a3d7", + "zh:172c9e4902e9a01b1111bbbb9063a47804ec5f4207b2221df9c398239ff3b350", + "zh:39acce0806f1aeca106ea529053778681e332f3f895c21c6a6a9fb267bed1058", + "zh:58dadd7b96b7b706e2995a04f356862be7cfd6b55f6257464c8b10986abf8efa", + "zh:7230a5e49abed243317b9de0ee7fd365b4a2775b532a5d66006b39c4703978ac", + "zh:a1b60814ee9a0726c0cd43d36da2cee3db97ec296ee66b111a7e603997de9122", + "zh:a454c09162ccd342e101704dca4b0eedc2d11939ac48ebd7b7d505a96c1933e6", + "zh:ad6fdf73e072f510a7d8e2b70f9e1021d08b9076eae146b420f333905708c982", + "zh:de1de65b909c99430f8bef092718b75dc5c777e98daf474a2215621f35095bb8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fb1b9d1ea7bc79b7409f02aa7c19ba39afa22dbead69e83ae7eb2691ac5c2426", ] } diff --git a/aws-source/adapters/adapterhelpers_notfound_cache_test.go b/aws-source/adapters/adapterhelpers_notfound_cache_test.go index 25d67216..fc1205c3 100644 --- a/aws-source/adapters/adapterhelpers_notfound_cache_test.go +++ b/aws-source/adapters/adapterhelpers_notfound_cache_test.go @@ -455,8 +455,7 @@ func (s *testQueryResultStream) SendItem(item *sdp.Item) { } func (s *testQueryResultStream) SendError(err error) { - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { s.errors = append(s.errors, qErr) } else { s.errors = append(s.errors, &sdp.QueryError{ diff --git a/aws-source/adapters/adapterhelpers_util.go b/aws-source/adapters/adapterhelpers_util.go index 1a2724b6..5582a691 100644 --- a/aws-source/adapters/adapterhelpers_util.go +++ b/aws-source/adapters/adapterhelpers_util.go @@ -217,9 +217,8 @@ func GetAllAWSPartitionDNSSuffixes() []string { // WrapAWSError Wraps an AWS error in the appropriate SDP error func WrapAWSError(err error) *sdp.QueryError { - var responseErr *awsHttp.ResponseError - if errors.As(err, &responseErr) { + if responseErr, ok := errors.AsType[*awsHttp.ResponseError](err); ok { // If the input is bad, access is denied, or the thing wasn't found then // we should assume that it is not exist for this adapter if slices.Contains([]int{400, 403, 404}, responseErr.HTTPStatusCode()) { @@ -437,8 +436,7 @@ func (e E2ETest) Run(t *testing.T) { if !e.SkipNotFoundCheck { // Make sure the error is an SDP error - var sdpErr *sdp.QueryError - if errors.As(err, &sdpErr) { + if sdpErr, ok := errors.AsType[*sdp.QueryError](err); ok { if sdpErr.GetErrorType() != sdp.QueryError_NOTFOUND { t.Errorf("expected error to be NOTFOUND, got %v\nError: %v", sdpErr.GetErrorType().String(), sdpErr.GetErrorString()) } diff --git a/aws-source/adapters/apigateway-deployment.go b/aws-source/adapters/apigateway-deployment.go index 29ce47a2..928dd7c8 100644 --- a/aws-source/adapters/apigateway-deployment.go +++ b/aws-source/adapters/apigateway-deployment.go @@ -35,7 +35,7 @@ func deploymentOutputMapper(query, scope string, awsItem *types.Deployment) (*sd Scope: scope, } - restAPIID := strings.Split(query, "/")[0] + restAPIID, _, _ := strings.Cut(query, "/") item.LinkedItemQueries = append(item.LinkedItemQueries, &sdp.LinkedItemQuery{ Query: &sdp.Query{ @@ -65,7 +65,7 @@ func NewAPIGatewayDeploymentAdapter(client *apigateway.Client, accountID string, AccountID: accountID, Region: region, AdapterMetadata: deploymentAdapterMetadata, - cache: cache, + cache: cache, GetFunc: func(ctx context.Context, client *apigateway.Client, scope, query string) (*types.Deployment, error) { f := strings.Split(query, "/") if len(f) != 2 { diff --git a/aws-source/adapters/apigateway-model.go b/aws-source/adapters/apigateway-model.go index ddb710a0..1bea2345 100644 --- a/aws-source/adapters/apigateway-model.go +++ b/aws-source/adapters/apigateway-model.go @@ -28,7 +28,7 @@ func modelOutputMapper(query, scope string, awsItem *types.Model) (*sdp.Item, er return nil, err } - restAPIID := strings.Split(query, "/")[0] + restAPIID, _, _ := strings.Cut(query, "/") err = attributes.Set("UniqueAttribute", fmt.Sprintf("%s/%s", restAPIID, *awsItem.Name)) if err != nil { @@ -61,7 +61,7 @@ func NewAPIGatewayModelAdapter(client *apigateway.Client, accountID string, regi AccountID: accountID, Region: region, AdapterMetadata: modelAdapterMetadata, - cache: cache, + cache: cache, GetFunc: func(ctx context.Context, client *apigateway.Client, scope, query string) (*types.Model, error) { f := strings.Split(query, "/") if len(f) != 2 { diff --git a/aws-source/adapters/apigateway-stage.go b/aws-source/adapters/apigateway-stage.go index 52309923..e60b31de 100644 --- a/aws-source/adapters/apigateway-stage.go +++ b/aws-source/adapters/apigateway-stage.go @@ -42,7 +42,7 @@ func stageOutputMapper(query, scope string, awsItem *types.Stage) (*sdp.Item, er // if it is `GET`, the query will be: rest-api-id/stage-name // if it is `SEARCH`, the query will be: rest-api-id/deployment-id or rest-api-id - restAPIID := strings.Split(query, "/")[0] + restAPIID, _, _ := strings.Cut(query, "/") err = attributes.Set("UniqueAttribute", fmt.Sprintf("%s/%s", restAPIID, *awsItem.StageName)) if err != nil { @@ -87,7 +87,7 @@ func NewAPIGatewayStageAdapter(client *apigateway.Client, accountID string, regi AccountID: accountID, Region: region, AdapterMetadata: stageAdapterMetadata, - cache: cache, + cache: cache, GetFunc: func(ctx context.Context, client *apigateway.Client, scope, query string) (*types.Stage, error) { f := strings.Split(query, "/") if len(f) != 2 { diff --git a/aws-source/adapters/cloudfront-distribution_test.go b/aws-source/adapters/cloudfront-distribution_test.go index 3fd3db2a..f8c8b8f3 100644 --- a/aws-source/adapters/cloudfront-distribution_test.go +++ b/aws-source/adapters/cloudfront-distribution_test.go @@ -193,38 +193,11 @@ func (t TestCloudFrontClient) GetDistribution(ctx context.Context, params *cloud ViewerProtocolPolicy: types.ViewerProtocolPolicyHttpsOnly, CachePolicyId: new("test-cache-policy-id"), // link Compress: new(true), - DefaultTTL: new(int64(1)), - FieldLevelEncryptionId: new("test-field-level-encryption-id"), // link - MaxTTL: new(int64(1)), - MinTTL: new(int64(1)), + FieldLevelEncryptionId: new("test-field-level-encryption-id"), // link OriginRequestPolicyId: new("test-origin-request-policy-id"), // link RealtimeLogConfigArn: new("arn:aws:logs:us-east-1:123456789012:realtime-log-config/test-id"), // link ResponseHeadersPolicyId: new("test-response-headers-policy-id"), // link SmoothStreaming: new(true), - ForwardedValues: &types.ForwardedValues{ - Cookies: &types.CookiePreference{ - Forward: types.ItemSelectionWhitelist, - WhitelistedNames: &types.CookieNames{ - Quantity: new(int32(1)), - Items: []string{ - "cooke_123", - }, - }, - }, - QueryString: new(true), - Headers: &types.Headers{ - Quantity: new(int32(1)), - Items: []string{ - "X-Customer-Header", - }, - }, - QueryStringCacheKeys: &types.QueryStringCacheKeys{ - Quantity: new(int32(1)), - Items: []string{ - "test-query-string-cache-key", - }, - }, - }, FunctionAssociations: &types.FunctionAssociations{ Quantity: new(int32(1)), Items: []types.FunctionAssociation{ @@ -326,8 +299,6 @@ func (t TestCloudFrontClient) GetDistribution(ctx context.Context, params *cloud }, ViewerCertificate: &types.ViewerCertificate{ ACMCertificateArn: new("arn:aws:acm:us-east-1:123456789012:certificate/test-id"), // link - Certificate: new("test-certificate"), - CertificateSource: types.CertificateSourceAcm, CloudFrontDefaultCertificate: new(true), IAMCertificateId: new("test-iam-certificate-id"), // link MinimumProtocolVersion: types.MinimumProtocolVersion(types.SslProtocolSSLv3), diff --git a/aws-source/adapters/ecs-task-definition_test.go b/aws-source/adapters/ecs-task-definition_test.go index e4b772f2..ea4c94fa 100644 --- a/aws-source/adapters/ecs-task-definition_test.go +++ b/aws-source/adapters/ecs-task-definition_test.go @@ -180,7 +180,6 @@ func (t *ecsTestClient) DescribeTaskDefinition(ctx context.Context, params *ecs. SizeInGiB: 1, }, ExecutionRoleArn: new("arn:aws:iam:us-east-2:123456789012:role/foo"), // link - InferenceAccelerators: []types.InferenceAccelerator{}, IpcMode: types.IpcModeHost, Memory: new("memory"), NetworkMode: types.NetworkModeAwsvpc, diff --git a/aws-source/adapters/ecs-task_test.go b/aws-source/adapters/ecs-task_test.go index d149d316..dde9f64e 100644 --- a/aws-source/adapters/ecs-task_test.go +++ b/aws-source/adapters/ecs-task_test.go @@ -92,7 +92,6 @@ func (t *ecsTestClient) DescribeTasks(ctx context.Context, params *ecs.DescribeT Name: new("simple-app"), }, }, - InferenceAcceleratorOverrides: []types.InferenceAcceleratorOverride{}, }, PullStartedAt: new(time.Now()), PullStoppedAt: new(time.Now()), diff --git a/aws-source/adapters/integration/apigateway/find.go b/aws-source/adapters/integration/apigateway/find.go index 7be3a408..32658b26 100644 --- a/aws-source/adapters/integration/apigateway/find.go +++ b/aws-source/adapters/integration/apigateway/find.go @@ -50,8 +50,7 @@ func findMethod(ctx context.Context, client *apigateway.Client, restAPIID, resou }) if err != nil { - var notFoundErr *types.NotFoundException - if errors.As(err, ¬FoundErr) { + if _, ok := errors.AsType[*types.NotFoundException](err); ok { return integration.NewNotFoundError(integration.ResourceName( integration.APIGateway, methodSrc, @@ -74,8 +73,7 @@ func findMethodResponse(ctx context.Context, client *apigateway.Client, restAPII }) if err != nil { - var notFoundErr *types.NotFoundException - if errors.As(err, ¬FoundErr) { + if _, ok := errors.AsType[*types.NotFoundException](err); ok { return integration.NewNotFoundError(integration.ResourceName( integration.APIGateway, methodResponseSrc, @@ -98,8 +96,7 @@ func findIntegration(ctx context.Context, client *apigateway.Client, restAPIID, }) if err != nil { - var notFoundErr *types.NotFoundException - if errors.As(err, ¬FoundErr) { + if _, ok := errors.AsType[*types.NotFoundException](err); ok { return integration.NewNotFoundError(integration.ResourceName( integration.APIGateway, integrationSrc, @@ -178,8 +175,7 @@ func findStageByName(ctx context.Context, client *apigateway.Client, restAPIID, StageName: &name, }) if err != nil { - var notFoundErr *types.NotFoundException - if errors.As(err, ¬FoundErr) { + if _, ok := errors.AsType[*types.NotFoundException](err); ok { return integration.NewNotFoundError(integration.ResourceName( integration.APIGateway, stageSrc, @@ -207,8 +203,7 @@ func findModelByName(ctx context.Context, client *apigateway.Client, restAPIID, ModelName: &name, }) if err != nil { - var notFoundErr *types.NotFoundException - if errors.As(err, ¬FoundErr) { + if _, ok := errors.AsType[*types.NotFoundException](err); ok { return integration.NewNotFoundError(integration.ResourceName( integration.APIGateway, stageSrc, diff --git a/aws-source/adapters/integration/ssm/main_test.go b/aws-source/adapters/integration/ssm/main_test.go index 81492ce8..595d1704 100644 --- a/aws-source/adapters/integration/ssm/main_test.go +++ b/aws-source/adapters/integration/ssm/main_test.go @@ -90,8 +90,7 @@ func TestIntegrationSSM(t *testing.T) { }, }) if err != nil { - var alreadyExistsErr *types.ParameterAlreadyExists - if errors.As(err, &alreadyExistsErr) { + if _, ok := errors.AsType[*types.ParameterAlreadyExists](err); ok { // Skip if parameter already exists continue } else { diff --git a/aws-source/adapters/kms-key_test.go b/aws-source/adapters/kms-key_test.go index 03e0f887..7c6782a2 100644 --- a/aws-source/adapters/kms-key_test.go +++ b/aws-source/adapters/kms-key_test.go @@ -15,17 +15,17 @@ type kmsTestClient struct{} func (t kmsTestClient) DescribeKey(ctx context.Context, params *kms.DescribeKeyInput, optFns ...func(*kms.Options)) (*kms.DescribeKeyOutput, error) { return &kms.DescribeKeyOutput{ KeyMetadata: &types.KeyMetadata{ - AWSAccountId: new("846764612917"), - KeyId: new("b8a9477d-836c-491f-857e-07937918959b"), - Arn: new("arn:aws:kms:us-west-2:846764612917:key/b8a9477d-836c-491f-857e-07937918959b"), - CreationDate: new(time.Date(2017, 6, 30, 21, 44, 32, 140000000, time.UTC)), - Enabled: true, - Description: new("Default KMS key that protects my S3 objects when no other key is defined"), - KeyUsage: types.KeyUsageTypeEncryptDecrypt, - KeyState: types.KeyStateEnabled, - Origin: types.OriginTypeAwsKms, - KeyManager: types.KeyManagerTypeAws, - CustomerMasterKeySpec: types.CustomerMasterKeySpecSymmetricDefault, + AWSAccountId: new("846764612917"), + KeyId: new("b8a9477d-836c-491f-857e-07937918959b"), + Arn: new("arn:aws:kms:us-west-2:846764612917:key/b8a9477d-836c-491f-857e-07937918959b"), + CreationDate: new(time.Date(2017, 6, 30, 21, 44, 32, 140000000, time.UTC)), + Enabled: true, + Description: new("Default KMS key that protects my S3 objects when no other key is defined"), + KeyUsage: types.KeyUsageTypeEncryptDecrypt, + KeyState: types.KeyStateEnabled, + Origin: types.OriginTypeAwsKms, + KeyManager: types.KeyManagerTypeAws, + KeySpec: types.KeySpecSymmetricDefault, EncryptionAlgorithms: []types.EncryptionAlgorithmSpec{ types.EncryptionAlgorithmSpecSymmetricDefault, }, diff --git a/aws-source/adapters/network-firewall-firewall.go b/aws-source/adapters/network-firewall-firewall.go index ad366de3..726882f1 100644 --- a/aws-source/adapters/network-firewall-firewall.go +++ b/aws-source/adapters/network-firewall-firewall.go @@ -80,6 +80,8 @@ func firewallGetFunc(ctx context.Context, client networkFirewallClient, scope st switch response.FirewallStatus.Status { case types.FirewallStatusValueDeleting: health = sdp.Health_HEALTH_PENDING.Enum() + case types.FirewallStatusValueFailed: + health = sdp.Health_HEALTH_ERROR.Enum() case types.FirewallStatusValueProvisioning: health = sdp.Health_HEALTH_PENDING.Enum() case types.FirewallStatusValueReady: @@ -232,7 +234,7 @@ func NewNetworkFirewallFirewallAdapter(client networkFirewallClient, accountID s Region: region, ListInput: &networkfirewall.ListFirewallsInput{}, AdapterMetadata: networkFirewallFirewallAdapterMetadata, - cache: cache, + cache: cache, GetInputMapper: func(scope, query string) *networkfirewall.DescribeFirewallInput { return &networkfirewall.DescribeFirewallInput{ FirewallName: &query, diff --git a/aws-source/adapters/rds-db-cluster-parameter-group_test.go b/aws-source/adapters/rds-db-cluster-parameter-group_test.go index 7bbc1b96..655d19c9 100644 --- a/aws-source/adapters/rds-db-cluster-parameter-group_test.go +++ b/aws-source/adapters/rds-db-cluster-parameter-group_test.go @@ -10,12 +10,10 @@ import ( func TestDBClusterParameterGroupOutputMapper(t *testing.T) { group := ClusterParameterGroup{ - DBClusterParameterGroup: types.DBClusterParameterGroup{ - DBClusterParameterGroupName: new("default.aurora-mysql5.7"), - DBParameterGroupFamily: new("aurora-mysql5.7"), - Description: new("Default cluster parameter group for aurora-mysql5.7"), - DBClusterParameterGroupArn: new("arn:aws:rds:eu-west-1:052392120703:cluster-pg:default.aurora-mysql5.7"), - }, + DBClusterParameterGroupName: new("default.aurora-mysql5.7"), + DBParameterGroupFamily: new("aurora-mysql5.7"), + Description: new("Default cluster parameter group for aurora-mysql5.7"), + DBClusterParameterGroupArn: new("arn:aws:rds:eu-west-1:052392120703:cluster-pg:default.aurora-mysql5.7"), Parameters: []types.Parameter{ { ParameterName: new("activate_all_roles_on_login"), diff --git a/aws-source/adapters/rds-db-parameter-group_test.go b/aws-source/adapters/rds-db-parameter-group_test.go index 24c7606a..02d52b28 100644 --- a/aws-source/adapters/rds-db-parameter-group_test.go +++ b/aws-source/adapters/rds-db-parameter-group_test.go @@ -10,12 +10,10 @@ import ( func TestDBParameterGroupOutputMapper(t *testing.T) { group := ParameterGroup{ - DBParameterGroup: types.DBParameterGroup{ - DBParameterGroupName: new("default.aurora-mysql5.7"), - DBParameterGroupFamily: new("aurora-mysql5.7"), - Description: new("Default parameter group for aurora-mysql5.7"), - DBParameterGroupArn: new("arn:aws:rds:eu-west-1:052392120703:pg:default.aurora-mysql5.7"), - }, + DBParameterGroupName: new("default.aurora-mysql5.7"), + DBParameterGroupFamily: new("aurora-mysql5.7"), + Description: new("Default parameter group for aurora-mysql5.7"), + DBParameterGroupArn: new("arn:aws:rds:eu-west-1:052392120703:pg:default.aurora-mysql5.7"), Parameters: []types.Parameter{ { ParameterName: new("activate_all_roles_on_login"), diff --git a/aws-source/adapters/route53-health-check_test.go b/aws-source/adapters/route53-health-check_test.go index 91e98f33..bca0a56b 100644 --- a/aws-source/adapters/route53-health-check_test.go +++ b/aws-source/adapters/route53-health-check_test.go @@ -11,23 +11,21 @@ import ( func TestHealthCheckItemMapper(t *testing.T) { hc := HealthCheck{ - HealthCheck: types.HealthCheck{ - Id: new("d7ce5d72-6d1f-4147-8246-d0ca3fb505d6"), - CallerReference: new("85d56b3f-873c-498b-a2dd-554ec13c5289"), - HealthCheckConfig: &types.HealthCheckConfig{ - IPAddress: new("1.1.1.1"), - Port: new(int32(443)), - Type: types.HealthCheckTypeHttps, - FullyQualifiedDomainName: new("one.one.one.one"), - RequestInterval: new(int32(30)), - FailureThreshold: new(int32(3)), - MeasureLatency: new(false), - Inverted: new(false), - Disabled: new(false), - EnableSNI: new(true), - }, - HealthCheckVersion: new(int64(1)), + Id: new("d7ce5d72-6d1f-4147-8246-d0ca3fb505d6"), + CallerReference: new("85d56b3f-873c-498b-a2dd-554ec13c5289"), + HealthCheckConfig: &types.HealthCheckConfig{ + IPAddress: new("1.1.1.1"), + Port: new(int32(443)), + Type: types.HealthCheckTypeHttps, + FullyQualifiedDomainName: new("one.one.one.one"), + RequestInterval: new(int32(30)), + FailureThreshold: new(int32(3)), + MeasureLatency: new(false), + Inverted: new(false), + Disabled: new(false), + EnableSNI: new(true), }, + HealthCheckVersion: new(int64(1)), HealthCheckObservations: []types.HealthCheckObservation{ { Region: types.HealthCheckRegionApNortheast1, diff --git a/aws-source/adapters/s3.go b/aws-source/adapters/s3.go index 7287734b..d751ebbd 100644 --- a/aws-source/adapters/s3.go +++ b/aws-source/adapters/s3.go @@ -222,8 +222,7 @@ func getImpl(ctx context.Context, cache sdpcache.Cache, client S3Client, scope s if err != nil { err = WrapAWSError(err) - var queryErr *sdp.QueryError - if errors.As(err, &queryErr) { + if queryErr, ok := errors.AsType[*sdp.QueryError](err); ok { // Cache not-found errors and other non-retryable errors if queryErr.GetErrorType() == sdp.QueryError_NOTFOUND || !CanRetry(queryErr) { cache.StoreUnavailableItem(ctx, err, CacheDuration, ck) @@ -233,9 +232,7 @@ func getImpl(ctx context.Context, cache sdpcache.Cache, client S3Client, scope s } bucket := Bucket{ - Bucket: types.Bucket{ - Name: bucketName, - }, + Name: bucketName, GetBucketLocationOutput: *location, } diff --git a/aws-source/adapters/s3_test.go b/aws-source/adapters/s3_test.go index 42682f47..a0cdec7d 100644 --- a/aws-source/adapters/s3_test.go +++ b/aws-source/adapters/s3_test.go @@ -32,8 +32,7 @@ func TestS3SearchImpl(t *testing.T) { // We EXPECT this to succeed, but it currently fails with NOSCOPE error // This test demonstrates the bug existing if err != nil { - var ire *sdp.QueryError - if errors.As(err, &ire) { + if ire, ok := errors.AsType[*sdp.QueryError](err); ok { if ire.GetErrorType() == sdp.QueryError_NOSCOPE && strings.Contains(ire.GetErrorString(), "ARN scope") { // This is the bug - the search fails when it should succeed t.Errorf("BUG REPRODUCED: Search failed with NOSCOPE error when it should succeed. "+ @@ -709,8 +708,7 @@ func TestS3SearchWithARNFormat(t *testing.T) { // (S3 is global), and the adapter should use its own scope since it knows the account ID. // CURRENT: Search fails with NOSCOPE error - THIS IS THE BUG if err != nil { - var ire *sdp.QueryError - if errors.As(err, &ire) { + if ire, ok := errors.AsType[*sdp.QueryError](err); ok { if ire.GetErrorType() == sdp.QueryError_NOSCOPE && strings.Contains(ire.GetErrorString(), "ARN scope") { // This is the bug - the search fails when it should succeed t.Errorf("BUG REPRODUCED: Search failed with NOSCOPE error when it should succeed. "+ diff --git a/aws-source/build/package/Dockerfile b/aws-source/build/package/Dockerfile index 9b1d83d9..29f214a2 100644 --- a/aws-source/build/package/Dockerfile +++ b/aws-source/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION diff --git a/aws-source/module/provider/.github/workflows/finalize-copybara-sync.yml b/aws-source/module/provider/.github/workflows/finalize-copybara-sync.yml index 9ed74943..f3128730 100644 --- a/aws-source/module/provider/.github/workflows/finalize-copybara-sync.yml +++ b/aws-source/module/provider/.github/workflows/finalize-copybara-sync.yml @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: go.mod diff --git a/aws-source/module/provider/.github/workflows/release.yml b/aws-source/module/provider/.github/workflows/release.yml index bf09de90..8f698869 100644 --- a/aws-source/module/provider/.github/workflows/release.yml +++ b/aws-source/module/provider/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: uses: 1password/install-cli-action@v4.1.0 - name: Load GPG secrets from 1Password - uses: 1password/load-secrets-action@v4.1.1 + uses: 1password/load-secrets-action@v5.0.1 with: export-env: true env: @@ -38,7 +38,7 @@ jobs: passphrase: ${{ env.PASSPHRASE }} - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@v7 with: go-version-file: go.mod @@ -46,7 +46,7 @@ jobs: uses: goreleaser/goreleaser-action@v7 with: # renovate: datasource=github-releases depName=goreleaser/goreleaser - version: "v2.17.1" + version: "v2.18.0" args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/aws-source/module/provider/provider_test.go b/aws-source/module/provider/provider_test.go index db9ca1d8..868a6f66 100644 --- a/aws-source/module/provider/provider_test.go +++ b/aws-source/module/provider/provider_test.go @@ -149,8 +149,8 @@ func startTestServer(t *testing.T) string { func unitTestProviderFactories(serverURL string) map[string]func() (tfprotov6.ProviderServer, error) { return map[string]func() (tfprotov6.ProviderServer, error){ "overmind": providerserver.NewProtocol6WithError(&testProvider{ - overmindProvider: overmindProvider{version: "test"}, - serverURL: serverURL, + version: "test", + serverURL: serverURL, }), } } diff --git a/aws-source/proc/proc.go b/aws-source/proc/proc.go index 1d638a4d..5577869a 100644 --- a/aws-source/proc/proc.go +++ b/aws-source/proc/proc.go @@ -98,8 +98,7 @@ func isOptInRegionError(err error) bool { return false } - var apiErr smithy.APIError - if errors.As(err, &apiErr) { + if apiErr, ok := errors.AsType[smithy.APIError](err); ok { if apiErr.ErrorCode() == "InvalidIdentityToken" { errMsg := err.Error() if strings.Contains(errMsg, "No OpenIDConnect provider found") { diff --git a/cmd/changes_get_change_test.go b/cmd/changes_get_change_test.go index c014bf08..33505cf0 100644 --- a/cmd/changes_get_change_test.go +++ b/cmd/changes_get_change_test.go @@ -81,8 +81,7 @@ func TestValidateChangeStatus(t *testing.T) { t.Errorf("validateChangeStatus() expected error but got none") } // Check that it returns a flagError - var fError flagError - if !errors.As(err, &fError) { + if _, ok := errors.AsType[flagError](err); !ok { t.Errorf("validateChangeStatus() expected flagError but got %T", err) } } else { diff --git a/cmd/integrations_tfc.go b/cmd/integrations_tfc.go index 0c22acbf..e0a7467e 100644 --- a/cmd/integrations_tfc.go +++ b/cmd/integrations_tfc.go @@ -105,8 +105,7 @@ func GetTfc(cmd *cobra.Command, args []string) error { client := AuthenticatedConfigurationClient(ctx, oi) params, err := client.GetHcpConfig(ctx, &connect.Request[sdp.GetHcpConfigRequest]{}) - var cErr *connect.Error - if errors.As(err, &cErr) { + if cErr, ok := errors.AsType[*connect.Error](err); ok { if cErr.Code() == connect.CodeNotFound { fmt.Println("HCP Terraform Cloud integration is not enabled. Use `create-tfc` to enable it.") return nil diff --git a/cmd/request_load.go b/cmd/request_load.go index 2ff6a1a1..2c948a04 100644 --- a/cmd/request_load.go +++ b/cmd/request_load.go @@ -54,13 +54,13 @@ func RequestLoad(cmd *cobra.Command, args []string) error { } handler := &requestHandler{ - lf: lf, - LoggingGatewayMessageHandler: sdpws.LoggingGatewayMessageHandler{Level: log.TraceLevel}, - items: []*sdp.Item{}, - edges: []*sdp.Edge{}, - msgLog: []*sdp.GatewayResponse{}, - bookmarkLoadResult: make(chan *sdp.BookmarkLoadResult, 128), - snapshotLoadResult: make(chan *sdp.SnapshotLoadResult, 128), + lf: lf, + Level: log.TraceLevel, + items: []*sdp.Item{}, + edges: []*sdp.Edge{}, + msgLog: []*sdp.GatewayResponse{}, + bookmarkLoadResult: make(chan *sdp.BookmarkLoadResult, 128), + snapshotLoadResult: make(chan *sdp.SnapshotLoadResult, 128), } gatewayUrl := oi.GatewayUrl() lf["gateway-url"] = gatewayUrl diff --git a/cmd/request_query.go b/cmd/request_query.go index 6c083703..df990059 100644 --- a/cmd/request_query.go +++ b/cmd/request_query.go @@ -34,13 +34,13 @@ func RequestQuery(cmd *cobra.Command, args []string) error { lf := log.Fields{} handler := &requestHandler{ - lf: lf, - LoggingGatewayMessageHandler: sdpws.LoggingGatewayMessageHandler{Level: log.TraceLevel}, - items: []*sdp.Item{}, - edges: []*sdp.Edge{}, - msgLog: []*sdp.GatewayResponse{}, - bookmarkLoadResult: make(chan *sdp.BookmarkLoadResult, 128), - snapshotLoadResult: make(chan *sdp.SnapshotLoadResult, 128), + lf: lf, + Level: log.TraceLevel, + items: []*sdp.Item{}, + edges: []*sdp.Edge{}, + msgLog: []*sdp.GatewayResponse{}, + bookmarkLoadResult: make(chan *sdp.BookmarkLoadResult, 128), + snapshotLoadResult: make(chan *sdp.SnapshotLoadResult, 128), } gatewayUrl := oi.GatewayUrl() lf["gateway-url"] = gatewayUrl diff --git a/cmd/snapshots_create.go b/cmd/snapshots_create.go index 22253f86..50d2a11d 100644 --- a/cmd/snapshots_create.go +++ b/cmd/snapshots_create.go @@ -51,10 +51,10 @@ func CreateSnapshot(cmd *cobra.Command, args []string) error { } handler := &createSnapshotHandler{ - lf: lf, - LoggingGatewayMessageHandler: sdpws.LoggingGatewayMessageHandler{Level: log.InfoLevel}, - items: []*sdp.Item{}, - edges: []*sdp.Edge{}, + lf: lf, + Level: log.InfoLevel, + items: []*sdp.Item{}, + edges: []*sdp.Edge{}, } gatewayUrl := oi.GatewayUrl() diff --git a/cmd/theme.go b/cmd/theme.go index bdb915eb..a65356c8 100644 --- a/cmd/theme.go +++ b/cmd/theme.go @@ -6,8 +6,8 @@ import ( "image/color" "os" - "github.com/charmbracelet/glamour" - "github.com/charmbracelet/glamour/ansi" + "charm.land/glamour/v2" + "charm.land/glamour/v2/ansi" lipgloss "charm.land/lipgloss/v2" ) diff --git a/cmd/theme_test.go b/cmd/theme_test.go index 969b2907..8abddbfd 100644 --- a/cmd/theme_test.go +++ b/cmd/theme_test.go @@ -1,19 +1,22 @@ package cmd import ( + "strings" "testing" ) func TestMarkdownToString(t *testing.T) { - markdown := `# some random markdown` - expectedOutput := "\n\x1b[38;2;36;36;40;48;2;121;112;235;1m\x1b[0m\x1b[38;2;36;36;40;48;2;121;112;235;1m\x1b[0m \x1b[38;2;36;36;40;48;2;121;112;235;1msome random\x1b[0m\x1b[38;2;36;36;40;48;2;121;112;235;1m markdown\x1b[0m\x1b[38;2;186;186;186m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[38;2;186;186;186m \x1b[0m\x1b[0m\n\x1b[0m\n" + InitPalette() + markdown := `# some random markdown` got := markdownToString(0, markdown) - if got != expectedOutput { - t.Errorf("Expected %q, but got %q", expectedOutput, got) - t.Log("Expected output:") - t.Log(expectedOutput) - t.Log("Got output:") - t.Log(got) + + if !strings.Contains(got, "some random") || !strings.Contains(got, "markdown") { + t.Fatalf("expected rendered markdown to contain heading text, got %q", got) + } + + // glamour v2 uses SGR reset (\x1b[m) instead of v1's explicit reset (\x1b[0m). + if !strings.Contains(got, "\x1b[") { + t.Fatalf("expected ANSI styling sequences in rendered output, got %q", got) } } diff --git a/go.mod b/go.mod index e1bdef8d..59e1eca1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/overmindtech/cli -go 1.26.4 +go 1.27.0 replace github.com/anthropics/anthropic-sdk-go => github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.4 @@ -16,33 +16,33 @@ replace github.com/exaring/otelpgx => github.com/overmindtech/otelpgx v0.0.0-202 replace github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.19.2 // CVE-2026-46384: hamba/avro is archived with no patch; iskorotkov/avro is the maintained fork. -replace github.com/hamba/avro/v2 => github.com/iskorotkov/avro/v2 v2.33.1 +replace github.com/hamba/avro/v2 => github.com/iskorotkov/avro/v2 v2.34.0 // CVE-2026-46599, CVE-2026-42500: gonum pins golang.org/x/image v0.25.0; force patched release. replace golang.org/x/image => golang.org/x/image v0.45.0 require ( atomicgo.dev/keyboard v0.2.10 - buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1 + buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1 buf.build/go/protovalidate v1.3.0 + charm.land/glamour/v2 v2.0.1 charm.land/lipgloss/v2 v2.0.6 cloud.google.com/go/aiplatform v1.126.0 - cloud.google.com/go/auth v0.22.0 + cloud.google.com/go/auth v0.23.2 cloud.google.com/go/auth/oauth2adapt v0.2.8 - cloud.google.com/go/bigquery v1.79.0 + cloud.google.com/go/bigquery v1.81.0 cloud.google.com/go/bigtable v1.52.0 cloud.google.com/go/certificatemanager v1.15.0 - cloud.google.com/go/compute v1.65.0 - cloud.google.com/go/compute/metadata v0.9.0 // indirect + cloud.google.com/go/compute v1.66.0 cloud.google.com/go/container v1.53.1 cloud.google.com/go/dataplex v1.36.0 cloud.google.com/go/dataproc/v2 v2.25.0 cloud.google.com/go/eventarc v1.25.0 cloud.google.com/go/filestore v1.16.0 cloud.google.com/go/functions v1.25.0 - cloud.google.com/go/iam v1.12.0 + cloud.google.com/go/iam v1.13.0 cloud.google.com/go/kms v1.33.0 - cloud.google.com/go/logging v1.19.0 + cloud.google.com/go/logging v1.19.1 cloud.google.com/go/monitoring v1.30.0 cloud.google.com/go/networksecurity v0.19.0 cloud.google.com/go/orgpolicy v1.20.0 @@ -52,21 +52,21 @@ require ( cloud.google.com/go/secretmanager v1.21.0 cloud.google.com/go/securitycentermanagement v1.6.0 cloud.google.com/go/spanner v1.94.0 - cloud.google.com/go/storage v1.64.0 + cloud.google.com/go/storage v1.65.0 cloud.google.com/go/storagetransfer v1.19.0 connectrpc.com/connect v1.20.0 // v1.19.0 was faulty, wait until it is above this version - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.3 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch/v4 v4.0.0 - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.2.0 - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3 v3.4.0 + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.3.0 + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4 v4.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/elasticsan/armelasticsan v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault/v2 v2.0.2 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/maintenance/armmaintenance v1.3.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.3.0 - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9 v9.0.0 + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11 v11.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/operationalinsights/armoperationalinsights/v3 v3.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresqlflexibleservers/v5 v5.0.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns/v2 v2.0.0 @@ -76,45 +76,42 @@ require ( github.com/Masterminds/semver/v3 v3.5.0 github.com/MrAlias/otel-schema-utils v0.4.0-alpha github.com/auth0/go-jwt-middleware/v3 v3.3.0 - github.com/aws/aws-sdk-go-v2 v1.43.5 - github.com/aws/aws-sdk-go-v2/config v1.32.36 - github.com/aws/aws-sdk-go-v2/credentials v1.19.35 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.36 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.42.5 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.72.0 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.67.5 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.66.4 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.44.2 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.63.2 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.321.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.90.1 - github.com/aws/aws-sdk-go-v2/service/efs v1.44.5 - github.com/aws/aws-sdk-go-v2/service/eks v1.91.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.36.5 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.58.6 - github.com/aws/aws-sdk-go-v2/service/iam v1.59.0 - github.com/aws/aws-sdk-go-v2/service/kms v1.55.5 - github.com/aws/aws-sdk-go-v2/service/lambda v1.101.3 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.67.2 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.44.5 - github.com/aws/aws-sdk-go-v2/service/rds v1.124.2 - github.com/aws/aws-sdk-go-v2/service/route53 v1.65.7 - github.com/aws/aws-sdk-go-v2/service/s3 v1.107.1 - github.com/aws/aws-sdk-go-v2/service/sns v1.42.5 - github.com/aws/aws-sdk-go-v2/service/sqs v1.46.5 - github.com/aws/aws-sdk-go-v2/service/ssm v1.73.5 - github.com/aws/aws-sdk-go-v2/service/sts v1.45.5 - github.com/aws/smithy-go v1.27.7 - github.com/cenkalti/backoff/v5 v5.0.3 - github.com/charmbracelet/glamour v0.10.0 + github.com/aws/aws-sdk-go-v2 v1.45.1 + github.com/aws/aws-sdk-go-v2/config v1.33.2 + github.com/aws/aws-sdk-go-v2/credentials v1.20.2 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.19.1 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.45.0 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.76.0 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.71.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.70.0 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.48.0 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.66.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.325.1 + github.com/aws/aws-sdk-go-v2/service/ecs v1.94.0 + github.com/aws/aws-sdk-go-v2/service/efs v1.47.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.96.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.39.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.61.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.62.0 + github.com/aws/aws-sdk-go-v2/service/kms v1.58.0 + github.com/aws/aws-sdk-go-v2/service/lambda v1.105.0 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.70.0 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.48.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.127.0 + github.com/aws/aws-sdk-go-v2/service/route53 v1.68.0 + github.com/aws/aws-sdk-go-v2/service/s3 v1.110.0 + github.com/aws/aws-sdk-go-v2/service/sns v1.45.0 + github.com/aws/aws-sdk-go-v2/service/sqs v1.50.0 + github.com/aws/aws-sdk-go-v2/service/ssm v1.76.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.48.0 + github.com/aws/smithy-go v1.28.1 + github.com/cenkalti/backoff/v7 v7.0.0 github.com/coder/websocket v1.8.15 - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/getsentry/sentry-go v0.48.0 github.com/go-jose/go-jose/v4 v4.1.4 github.com/google/btree v1.1.3 - github.com/google/cel-go v0.31.0 // indirect github.com/google/uuid v1.6.0 - github.com/googleapis/gax-go/v2 v2.23.0 + github.com/googleapis/gax-go/v2 v2.24.0 github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e github.com/hashicorp/go-retryablehttp v0.7.8 github.com/hashicorp/hcl/v2 v2.24.0 @@ -123,24 +120,23 @@ require ( github.com/hashicorp/terraform-plugin-go v0.31.0 github.com/hashicorp/terraform-plugin-testing v1.16.0 github.com/jedib0t/go-pretty/v6 v6.8.3 - github.com/lithammer/fuzzysearch v1.1.8 // indirect github.com/micahhausler/aws-iam-policy v0.4.4 - github.com/miekg/dns v1.1.72 + github.com/miekg/dns v1.1.73 github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/reflow v0.3.0 github.com/nats-io/jwt/v2 v2.8.2 - github.com/nats-io/nats-server/v2 v2.14.5 + github.com/nats-io/nats-server/v2 v2.14.6 github.com/nats-io/nats.go v1.53.1 github.com/nats-io/nkeys v0.4.16 github.com/openrdap/rdap v0.10.1 github.com/overmindtech/pterm v0.0.0-20240919144758-04d94ccb2297 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c - github.com/sirupsen/logrus v1.10.0 + github.com/sirupsen/logrus v1.10.2 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 github.com/spf13/viper v1.21.0 - github.com/stretchr/testify v1.11.1 + github.com/stretchr/testify v1.12.1 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 github.com/uptrace/opentelemetry-go-extra/otellogrus v0.3.2 github.com/xiam/dig v0.0.0-20191116195832-893b5fb5093b @@ -152,7 +148,6 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.45.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.45.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.45.0 - go.opentelemetry.io/otel/metric v1.45.0 // indirect go.opentelemetry.io/otel/sdk v1.45.0 go.opentelemetry.io/otel/trace v1.45.0 go.uber.org/automaxprocs v1.6.0 @@ -163,30 +158,28 @@ require ( golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.22.0 golang.org/x/text v0.41.0 - golang.org/x/time v0.15.0 // indirect gonum.org/v1/gonum v0.17.0 - google.golang.org/api v0.292.0 - google.golang.org/genproto/googleapis/rpc v0.0.0-20260810153831-ec0a7760b754 - google.golang.org/grpc v1.83.0 + google.golang.org/api v0.293.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 + google.golang.org/grpc v1.83.2 google.golang.org/protobuf v1.36.12 gopkg.in/ini.v1 v1.67.3 - gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.36.3 - k8s.io/apimachinery v0.36.3 - k8s.io/client-go v0.36.3 + k8s.io/api v0.36.4 + k8s.io/apimachinery v0.36.4 + k8s.io/client-go v0.36.4 sigs.k8s.io/kind v0.32.0 - sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect ) require ( al.essio.dev/pkg/shellescape v1.5.1 // indirect atomicgo.dev/cursor v0.2.0 // indirect atomicgo.dev/schedule v0.1.0 // indirect - cel.dev/expr v0.25.2 // indirect + cel.dev/expr v0.25.3 // indirect cloud.google.com/go v0.123.0 // indirect + cloud.google.com/go/compute/metadata v0.9.0 // indirect cloud.google.com/go/longrunning v1.2.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect - github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.8.0 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.57.0 // indirect @@ -201,26 +194,24 @@ require ( github.com/apache/arrow/go/v15 v15.0.2 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/apparentlymart/go-textseg/v17 v17.0.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.17 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.36 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.37 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.16 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.29 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.13 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.36 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.37 // indirect - github.com/aws/aws-sdk-go-v2/service/signin v1.5.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.33.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.5 // indirect - github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.20 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/signin v1.8.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.41.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charmbracelet/colorprofile v0.4.3 // indirect - github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 // indirect; being pulled by glamour, this will be resolved in https://github.com/charmbracelet/glamour/pull/408 github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 // indirect github.com/charmbracelet/x/ansi v0.11.8 // indirect - github.com/charmbracelet/x/cellbuf v0.0.15 // indirect github.com/charmbracelet/x/exp/slice v0.0.0-20250417172821-98fd948af1b1 // indirect github.com/charmbracelet/x/term v0.2.2 // indirect github.com/charmbracelet/x/termios v0.1.1 // indirect @@ -230,7 +221,8 @@ require ( github.com/cloudflare/circl v1.6.3 // indirect github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect github.com/containerd/console v1.0.5 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect github.com/emicklei/go-restful/v3 v3.13.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect @@ -245,16 +237,18 @@ require ( github.com/go-openapi/jsonpointer v0.21.1 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.1 // indirect + github.com/go-test/deep v1.1.1 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect - github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-json v0.10.6 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect + github.com/google/cel-go v0.31.0 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/gnostic-models v0.7.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-tpm v0.9.8 // indirect github.com/google/s2a-go v0.1.9 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.3.19 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.20 // indirect github.com/gookit/color v1.6.0 // indirect github.com/gorilla/css v1.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect @@ -290,6 +284,7 @@ require ( github.com/lestrrat-go/httprc/v3 v3.0.3 // indirect github.com/lestrrat-go/jwx/v3 v3.0.13 // indirect github.com/lestrrat-go/option/v2 v2.0.0 // indirect + github.com/lithammer/fuzzysearch v1.1.8 // indirect github.com/lucasb-eyer/go-colorful v1.4.1 // indirect github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-colorable v0.1.14 // indirect @@ -305,7 +300,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/muesli/cancelreader v0.2.2 // indirect - github.com/muesli/termenv v0.16.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/oklog/run v1.2.0 // indirect @@ -314,7 +308,6 @@ require ( github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect github.com/segmentio/asm v1.2.1 // indirect @@ -338,29 +331,31 @@ require ( go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect go.opentelemetry.io/otel/log v0.11.0 // indirect + go.opentelemetry.io/otel/metric v1.45.0 // indirect go.opentelemetry.io/otel/schema v0.0.17 // indirect go.opentelemetry.io/otel/sdk/metric v1.45.0 // indirect go.opentelemetry.io/proto/otlp v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect golang.org/x/crypto v0.55.0 // indirect golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect - golang.org/x/mod v0.38.0 // indirect + golang.org/x/mod v0.40.0 // indirect golang.org/x/sys v0.47.0 // indirect - golang.org/x/telemetry v0.0.0-20260708182218-49f421fb7959 // indirect + golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 // indirect golang.org/x/term v0.45.0 // indirect - golang.org/x/tools v0.48.0 // indirect + golang.org/x/time v0.15.0 // indirect + golang.org/x/tools v0.49.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20260519071638-aa98bba5eb94 // indirect + google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.140.0 // indirect k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect sigs.k8s.io/yaml v1.6.0 // indirect ) - -require github.com/go-test/deep v1.1.1 // indirect diff --git a/go.sum b/go.sum index fe114fc7..cc1905e8 100644 --- a/go.sum +++ b/go.sum @@ -8,36 +8,38 @@ atomicgo.dev/keyboard v0.2.10 h1:v7mvUKUZLHIggxULEIuWbT+WkkyQSgdbA201EziAhHU= atomicgo.dev/keyboard v0.2.10/go.mod h1:ap/z5ilnhLqYq852m6kPeTq5Z6aESGWu5mzRpJlC6aI= atomicgo.dev/schedule v0.1.0 h1:nTthAbhZS5YZmgYbb2+DH8uQIZcTlIrd4eYr3UQxEjs= atomicgo.dev/schedule v0.1.0/go.mod h1:xeUa3oAkiuHYh8bKiQBRojqAMq3PXXbJujjb0hw8pEU= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1 h1:6nlcxMOui23ZRVAfJM451duu79P1npA5JRdZqMilrrQ= -buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260709200747-435963d16310.1/go.mod h1:TCt1lluMFnctISJXvkIQ4x3ABrPuUKCWKyjKdkJNBpw= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1 h1:Slv0uGxx219srASyiaI5C9cDlyG8kNDcXpTSYcuAeE4= +buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.12-20260825204119-511051f7f437.1/go.mod h1:TCt1lluMFnctISJXvkIQ4x3ABrPuUKCWKyjKdkJNBpw= buf.build/go/protovalidate v1.3.0 h1:8ITcnZGkAHx6TyhZvro+iET/AyqU8gEWQJK2WsT62ms= buf.build/go/protovalidate v1.3.0/go.mod h1:82s5g+rFRj1CZPiLv6OTA31jBu2fpq7mLXHwa9mZfEs= -cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs= -cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= +cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0= +cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= +charm.land/glamour/v2 v2.0.1 h1:xl+r00A4aJWU0z8fgwKd9fQQ4rsphqGUzuEiXZP5n+c= +charm.land/glamour/v2 v2.0.1/go.mod h1:jo9z8XqVKPeEFMVdvCRLGk++RyJ3CdUwgNr7EvXLw3k= charm.land/lipgloss/v2 v2.0.6 h1:EaGKeuA8FvF+v2BT5VmZd2LoYLaMZJXA5n34th8nCIQ= charm.land/lipgloss/v2 v2.0.6/go.mod h1:ipDDJNSGa1hlwDtSfW1s2/xR8Vdhbut4PXh2zEKZd0Q= cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE= cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU= cloud.google.com/go/aiplatform v1.126.0 h1:5PxeWpQfkAyN8mtgtVp4H5nP+ntwPLFMjNREVdiolR0= cloud.google.com/go/aiplatform v1.126.0/go.mod h1:iR3za3evdprLe1XL2pLu0cYVCuTbc87QG0pgvcgiJlE= -cloud.google.com/go/auth v0.22.0 h1:Xp9wAKkLoeaYb5pYZZoQGz4E9sdPxIbzS3gywZE3ciQ= -cloud.google.com/go/auth v0.22.0/go.mod h1:M9o2Oz+YI2jAfxewJgb1vyI3vceHF+eohmxyzmrl+9s= +cloud.google.com/go/auth v0.23.2 h1:pxSCpfiji41hpzpPdMCftEUCezpgpqmmDdYiAjCKXxo= +cloud.google.com/go/auth v0.23.2/go.mod h1:4DhBRcqvtljQN3dJ57qtqbib5ZGCYE5f2crfiiC2EM0= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c= -cloud.google.com/go/bigquery v1.79.0 h1:+tW6oRuP/4dOgdl/p32on0+3OktVQtU+veOMxhjoOhE= -cloud.google.com/go/bigquery v1.79.0/go.mod h1:QTt5tgZxqqvZs3dOZKpvriGqy+CdvY9LyetirFZRPOE= +cloud.google.com/go/bigquery v1.81.0 h1:w0ygxA/AD6FDuewuIHPk0IrQXVJtZWTp5eazQ3KBtCw= +cloud.google.com/go/bigquery v1.81.0/go.mod h1:cc0XscySNQNuHBxuZSg5yyxFsg/ZHAfViAG49gJbWew= cloud.google.com/go/bigtable v1.52.0 h1:8DS8rq5Mn3XmPqXD/vk+1lyqcWJ4hs+0Hh8Ruqroj+U= cloud.google.com/go/bigtable v1.52.0/go.mod h1:51/CYIIpOoGrZ6koxZ9F5MFMwhtluPPeh0BvCJjl5RQ= cloud.google.com/go/certificatemanager v1.15.0 h1:PwljEZlI3lZgoFUG0pnIBNOwrQUaAP+gS0ZahTwUZBA= cloud.google.com/go/certificatemanager v1.15.0/go.mod h1:8dfGG2/TbUpCNqsCF/TIMOGV0OVvU6nhkZWTU4MmCXU= -cloud.google.com/go/compute v1.65.0 h1:K0a3NRvazE7sZn5qswwI6BtlaZv1fgR5wFop5LZCLz8= -cloud.google.com/go/compute v1.65.0/go.mod h1:vFq+Ztj9Rzhc8zf1t6hGp/6NdrEVG1GakkyVRQPRgKc= +cloud.google.com/go/compute v1.66.0 h1:v8pAJeA0xYPe/tJDMcyimdnHZ115LVrw3xCi9ZelTNQ= +cloud.google.com/go/compute v1.66.0/go.mod h1:h1O3BCv0Zd0/8rZ6PGx8aRBhKBtDC0AuvURtWg1hLLE= cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= cloud.google.com/go/container v1.53.1 h1:B/RHfOeKaf3vWSjtJO6DgwToCjHKzfeXmWYLCaowVoI= cloud.google.com/go/container v1.53.1/go.mod h1:/ZI9J3uuAQh0O3/n9qxkdTVCDB6kuwxEpC9MvEWnf/Q= -cloud.google.com/go/datacatalog v1.32.0 h1:fyYn8ODkGil5y3zTIqgIhOfzTu1ACaU2o+C750CO6Ac= -cloud.google.com/go/datacatalog v1.32.0/go.mod h1:DE272tynQUwheJeQAyVfV+nO8yrdkuDyOgH2LtOrkWM= +cloud.google.com/go/datacatalog v1.33.0 h1:8V80PpoAGdOOr2QhBrp4wZ66MDCbATdAB/fmVmo5rlU= +cloud.google.com/go/datacatalog v1.33.0/go.mod h1:/EMN04S73fZcPdtNg86VYLDrhi2HheMehQtMCS86Klk= cloud.google.com/go/dataplex v1.36.0 h1:r4O6RHEkwHr41ItsTUym0ZgH1iDf48R+W8fI7KoMNl8= cloud.google.com/go/dataplex v1.36.0/go.mod h1:ftgNMXBt+wJ4wPVNvYJ3UY3VTZtKS/i/uFEQppaEbKk= cloud.google.com/go/dataproc/v2 v2.25.0 h1:IF1wxkXvcgoTP92NVqX6QNDf2SdKNZFPa2IWeSKP310= @@ -48,12 +50,12 @@ cloud.google.com/go/filestore v1.16.0 h1:2GXy5jvq2oUX6HnCpx3GjzSqlcMz8K9gkHaF9HP cloud.google.com/go/filestore v1.16.0/go.mod h1:szr35omqptDEuXgBbJ8PdVdYM3lf/Md96kNufWr1tVs= cloud.google.com/go/functions v1.25.0 h1:ndUtLkam3XF9b0t2zVACH9D/EgFBISbVuQFqRz/X58k= cloud.google.com/go/functions v1.25.0/go.mod h1:b/tqakoKeAkj9RspEjqswWf5299Lkz9C/742QUD3OEk= -cloud.google.com/go/iam v1.12.0 h1:Aki3bX9aHUDKPHfnRJfDcTdVedvy6quGBQcTqx3DRXk= -cloud.google.com/go/iam v1.12.0/go.mod h1:FEZ4lXpADAC2AIpQY7LANNjjwyQ2jK439CI2VaD+sLY= +cloud.google.com/go/iam v1.13.0 h1:ufT3FPT5rFFXu6UtLkNoxaOaV5EuA1dsSkmemCSTo6U= +cloud.google.com/go/iam v1.13.0/go.mod h1:gHXdDEiPDvqd1q1KwBDGQlgZY/BwY760zU2LhOZS5w0= cloud.google.com/go/kms v1.33.0 h1:pG0X78m212b2pv9N4fdMoUO69LuZGQ9kSvn8sHBOFAo= cloud.google.com/go/kms v1.33.0/go.mod h1:CSGvW6GnMQbY+1nOHcIzhMtHSbExXlOmCKjWtYVjcpA= -cloud.google.com/go/logging v1.19.0 h1:NCqhdVUg3wQ8Cobdf16FDSuTGi3+6+hdSBHrY5TsR6Q= -cloud.google.com/go/logging v1.19.0/go.mod h1:i40NZCHC9Gqvod4yE+yQfDWwlgwW/SrshkkGibCHxcA= +cloud.google.com/go/logging v1.19.1 h1:7SsLhyTDBDrJw+Ll6Ns3I2mByqHXvJUc3rGjSlwiWgU= +cloud.google.com/go/logging v1.19.1/go.mod h1:2IkQ/d8jVJqV2qW8ZUGUiMjdZG1gkLD2JReGbZ8isqg= cloud.google.com/go/longrunning v1.2.0 h1:WjYH3YHBGCxGJP9M4dWGHBfXr/cFIjMkNgWcJj7/iMM= cloud.google.com/go/longrunning v1.2.0/go.mod h1:5KMQALFGOCtFoi2xSOA1u3H7WKlhmckgiyFw7+LGQp0= cloud.google.com/go/monitoring v1.30.0 h1:r/d+JUbyKmJ8b07iznuKfzVzrIXTWxHQ3lBRm3x2LlY= @@ -74,8 +76,8 @@ cloud.google.com/go/securitycentermanagement v1.6.0 h1:1oH0hTRrwS0Er8QVhrUR2ScQN cloud.google.com/go/securitycentermanagement v1.6.0/go.mod h1:2vT5sKJSeclefx8yku77inS/bAyEiLH9n1CHpshtDMQ= cloud.google.com/go/spanner v1.94.0 h1:tve2XojeMa32SsrDNkp3J08TW4TZUVrv8TvTqGUif4A= cloud.google.com/go/spanner v1.94.0/go.mod h1:Z2+83J5oVDmd1n5ntVMmjEuiNoXOpAyNeG7y1tuEHk0= -cloud.google.com/go/storage v1.64.0 h1:KLpxI/oX9LxeRsNqn877d2WyeT3ryiEwnGt8pwcSPZg= -cloud.google.com/go/storage v1.64.0/go.mod h1:lWyAtwvDZHdL3k68WVKbESP6bmWaV23ZJJ/JEVw/ZaQ= +cloud.google.com/go/storage v1.65.0 h1:McbFt5j+hTNx+dkFuzq7teakIKcpqGp/cJZRxMyfvAc= +cloud.google.com/go/storage v1.65.0/go.mod h1:UsS9OgFg/XHOSYakQ8ZtLWWeyGkk1WnmD/GsGfN0BHM= cloud.google.com/go/storagetransfer v1.19.0 h1:jh+3SegMUulEhuJbkADCv8lmfRC8/pCpxja4oex2Ns8= cloud.google.com/go/storagetransfer v1.19.0/go.mod h1:sy4ImXynHkm9CKmbILtmzLN36PHh7JOhUTpqXf5SvMs= cloud.google.com/go/trace v1.16.0 h1:GmQovzFc5F0CNfl0VLgL64aoTtu7xsM0YajW2GlG9+E= @@ -84,8 +86,8 @@ connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ= connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0 h1:aokoqcHvaGjiM3VpjKDfMMnF/8epJ+Q1HLJ7CudztqE= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0/go.mod h1:/WYEx9pcM9Y+Dd/APJaNlSvVSvzl54rrMdZT5+Oi2LM= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.0 h1:4gRPBpN1f6xt88yi4WR26m7XaD9OlWtVT6bWPdGUIok= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.0/go.mod h1:G7QVLxw1j1JVyrO1MA95S8m8HStaaleDZYTcfGgjB2o= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0 h1:CU4+EJeJi3TKYWEcYuSdWsjzw0nVsK/H0MSQOiPcymU= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0/go.mod h1:q0+UTSRvShwUCrR/s5HtyInYphN7Wvxb7snFM3u+SLA= github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.4.0 h1:xFaZZ+IubdftrDHnGGwZ6QvQ3KHTtWl2MCK+GMt2vxs= @@ -96,10 +98,10 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthoriza github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3 v3.0.0-beta.3/go.mod h1:ZCM0BEa95+Ov7zRyPZS40SY1pFANErtVgERanZHtgcg= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch/v4 v4.0.0 h1:KBRoKIQlg79mFK5LRndDGPrCDGRl2xyFr/vG8afLGys= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch/v4 v4.0.0/go.mod h1:w+PG/dv/phWHlE3OIKWa4CAITETZ52D8qznRGMbduPA= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.2.0 h1:WazERlTJNPkU74ZSp8vT77bHSCh3HSn8hu2iPqaEyt4= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.2.0/go.mod h1:E+lMyo/54sqYcxG3b2DJP+aUp2xP3VVDcYdyNYKdu74= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3 v3.4.0 h1:+EhRnIOLvffCvUMUfP+MgOp6PrtN1d6xt94DZtrC3lA= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3 v3.4.0/go.mod h1:Bb7kqorvA2acMCNFac+2ldoQWi7QrcMdH+9Gg9C7fSM= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.3.0 h1:9fxsQhv25YpYDqNV4EIuEOJWInhrJX0I2DS5kOaHLlo= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8 v8.3.0/go.mod h1:E7HnKr5NCwakxjN2GtTSE3eh+JIlSW44w6pnrRf1fMI= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4 v4.0.0 h1:PbV55iju1R5VSjwDjILVeCBF0+N5XFzUGPUb/yC0G08= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4 v4.0.0/go.mod h1:QrLT4jHN38ZKphjiVZfdl3iTadWextUIzPvMOj68hz4= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0 h1:lpOxwrQ919lCZoNCd69rVt8u1eLZuMORrGXqy8sNf3c= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0/go.mod h1:fSvRkb8d26z9dbL40Uf/OO6Vo9iExtZK3D0ulRV+8M0= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/elasticsan/armelasticsan v1.2.0 h1:8xYBtaMs3Msy1bFYTVrVFBh05JUGNMMP/v3z3x5hoIw= @@ -112,8 +114,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/maintenance/armmaintenance github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/maintenance/armmaintenance v1.3.0/go.mod h1:o8YD+BbSeK8ANH4SpxQFCiz5OIFKgHxV1uwF2FrQJYY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.3.0 h1:L7G3dExHBgUxsO3qpTGhk/P2dgnYyW48yn7AO33Tbek= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.3.0/go.mod h1:Ms6gYEy0+A2knfKrwdatsggTXYA2+ICKug8w7STorFw= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9 v9.0.0 h1:CbHDMVJhcJSmXenq+UDWyIjumzVkZIb5pVUGzsCok5M= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9 v9.0.0/go.mod h1:raqbEXrok4aycS74XoU6p9Hne1dliAFpHLizlp+qJoM= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11 v11.0.0 h1:6BG7Llwh8IcxjCQu7KZ7jMjtoMhKjvVP+pOmdQh1Nyw= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11 v11.0.0/go.mod h1:R3CG1mTV3BAxKaJl0hG2dU7FusEXL4vE4uCWKac01ew= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/operationalinsights/armoperationalinsights/v3 v3.0.0 h1:PQCYE8OR+vgoTJ1Vq6EutuoMN8n6LgJygxMSHNTsuYY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/operationalinsights/armoperationalinsights/v3 v3.0.0/go.mod h1:s9hOdyntXLv/Y+IzJ6+O021/eAo7omS8Y6KwwICcG58= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresqlflexibleservers/v5 v5.0.0 h1:S7K+MLPEYe+g9AX9dLKldBpYV03bPl7zeDaWhiNDqqs= @@ -134,8 +136,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage/v4 v4.1 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage/v4 v4.1.0/go.mod h1:U1yQRidgRofesJpSYiJWogdsrj24Xa0J4lR1HYb9Bd8= github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM= github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= -github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 h1:RHK7bS+HQMslb1sZpAokUt+zTVmue0hKSs2C791hhzU= -github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk= +github.com/AzureAD/microsoft-authentication-library-for-go v1.8.0 h1:Nljr4q1GRA/5vCrMONS+g4u4LRHNgOXVSh3O43J2CnI= +github.com/AzureAD/microsoft-authentication-library-for-go v1.8.0/go.mod h1:Y33QHnf0FfdVewFFISOGe20mkZbxX4H839o955/PoeI= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0 h1:l7+6kwRMJNwdCvYdDl7Eax+wzEYHSnNY7zrrfbhDdTA= @@ -181,90 +183,88 @@ github.com/apparentlymart/go-textseg/v17 v17.0.1 h1:bpMXRgQ5cEoRNuQke1a80/Nl6w3G github.com/apparentlymart/go-textseg/v17 v17.0.1/go.mod h1:fa8X4jgGeevslICIY6LcdjkSecWnXmYd9Lk34z/VxZs= github.com/auth0/go-jwt-middleware/v3 v3.3.0 h1:nRALRLGsUdWgxX0knqwp60YxiYypeZYfhr+yFCvHoGY= github.com/auth0/go-jwt-middleware/v3 v3.3.0/go.mod h1:WXL/zFf3nuQJWQOVj3hGUQ289ixKVSrFGwZn6LxaQsw= -github.com/aws/aws-sdk-go-v2 v1.43.5 h1:yKT5GYnFWhuDo+DqKvE5ZPwVn3RjC4MAeBtZGlh6AVM= -github.com/aws/aws-sdk-go-v2 v1.43.5/go.mod h1:wZjAJppCntyOGgVSmgVTfDyRJK5PHOasO6Wsy8U7Axk= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.17 h1:mn+Vxb9zgz/FE/yDTcFim3DZ1qpcrxR+qBQkBrl6bzA= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.17/go.mod h1:eDfmEFxu+BSVsUGLbzJhWjpOurv1mqczClS97yI8wdk= -github.com/aws/aws-sdk-go-v2/config v1.32.36 h1:mX6ietU7UlB4w/2IUaexJdsyUDvhTd+jYPjVePiyi6s= -github.com/aws/aws-sdk-go-v2/config v1.32.36/go.mod h1:rMpV4xk7ZK59edraSaHP0jsWrztWTT5tbCwWY495hug= -github.com/aws/aws-sdk-go-v2/credentials v1.19.35 h1:Cxua2RVdRwL0sfjHM/SnQoOnQ7xKng9m5EQBO8BnZlg= -github.com/aws/aws-sdk-go-v2/credentials v1.19.35/go.mod h1:9XQ+RSIGPkycr+oCJYnB1uTv5kMVVR+rd2vYK0Hxj2w= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.36 h1:gucL1KH/PAYbpTpBg09CiVpBdTu4qkCl8C7xOTBixUg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.36/go.mod h1:usTB+PHhNMhrx2dxUeHcM7OrT5pySvmjYI++IsefPN0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.36 h1:5CrzwxDqf4w3x1Vs3/NiZ0nsC34Hbm3pIDMWbsLebOE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.36/go.mod h1:A3gHdKZIvG/QXERzZwcxNS3RNDFcRCuhhTFBYp+V/nw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.36 h1:A4N2f4YPcST0v+dWtX+xrpPPCL9VTBhoIFFUWYqbacE= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.36/go.mod h1:B/Qr859uxWUEfZeGotK5KAEoof4Q9YWgNtPSwV6jcyk= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.37 h1:oyd3ke4V9AhKcRR7rRgxk1VyI+DjK2CBQtbxh3OkdaA= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.37/go.mod h1:aA9D7SqfG9IC1b7FLD7Iyc8Q4JN0a8gHhNjN4zPlIaI= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.42.5 h1:Z+8vxfSQrlz2ixwsZPUgBmoWTlWCt39HxaGeDWJic58= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.42.5/go.mod h1:dGix9no22yIDTfvm4RAC/lCGua6fQp0flRXlxb4+sMs= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.72.0 h1:mf/fEohgDVAdn88jaJjw5Q706jvuImdNOeDo9GWo0+g= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.72.0/go.mod h1:CttKcJwdqoiKLmmfPTTDj3DoBGhwEKzl/1YNQgNjxjg= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.67.5 h1:p1AleHsZYxxFkZ2s/12yRlaMIapHXHb+beCe9LY50A0= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.67.5/go.mod h1:/Tin04W5lC2x1RHu/SVfusYyB4Ja8CDXKLBcf6Lq2RU= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.66.4 h1:uLJvZPlHcNDKpy4DwiItYVxfHsY0xOUxvXQOwF6wQ4Q= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.66.4/go.mod h1:De2gtqReQOh6OwdgQUnJnGdmJqRvBCHRAbVDDqCy3Pk= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.44.2 h1:gwnbzXvPk4/7Uba0BwfkvJgSCNVJhzeOct565o6jaG4= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.44.2/go.mod h1:xuM5d+eTbmowB2AGPW5bJ8wRz+UJXj4HaVG9s76zZX8= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.63.2 h1:XPLNArcyPPBlFphAW0k5bP81oDq3FjuicY1sULuNN2A= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.63.2/go.mod h1:EtI09l1zaCea6NjQWKYR7OMBtQW2be9NwG6UQHOK72g= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.321.1 h1:rywWzHJUn9975OI1crMvzPzCPnwm1n5yVmU0HDc/izE= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.321.1/go.mod h1:r6DvSY3Gc51qW84EFQ175rEriqyz9cIOU9zxAGSnb7A= -github.com/aws/aws-sdk-go-v2/service/ecs v1.90.1 h1:X6uVy3H1Xg7GK1SGrhwadV0IBIagB5WD/uO7iKr0ZE8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.90.1/go.mod h1:sLTx85N+itmZPBvAufetc8CFCBE5RQSEuiaelJuPyVs= -github.com/aws/aws-sdk-go-v2/service/efs v1.44.5 h1:84jf8ABoTHX+6zzTDnnIgrGdLG7X1BrtuAt5DGk+VNM= -github.com/aws/aws-sdk-go-v2/service/efs v1.44.5/go.mod h1:oMhbqiQrnUpSnxJiMSngb4UNkGWNNgLnU/tZaiwlsVs= -github.com/aws/aws-sdk-go-v2/service/eks v1.91.0 h1:Aqb+wVKS/L7M2CHIdfYQchj9eHRqEceoi1enmd7/xn0= -github.com/aws/aws-sdk-go-v2/service/eks v1.91.0/go.mod h1:frF26xgNHHEOeY4ZZIfYGJGr0s5D39CePqNBG+gDnjY= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.36.5 h1:z7y5fST1uH8JHTiiFfnS6OBTUZd9PldhYWO5tOmuHuY= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.36.5/go.mod h1:FDk9ENyByNCzprimqPD9FGn6i/kbLVgiG5jFwC543HQ= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.58.6 h1:P2KzXoV/LpmGl606LpYoOic/sIJZ2rK3ISb0gq55fcI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.58.6/go.mod h1:g7QiYmqwcRBEzNv4wEF1A6iBPFqyo7CottPV9Cy4KuI= -github.com/aws/aws-sdk-go-v2/service/iam v1.59.0 h1:IHFV2oimyMi4RhjWdgzxLaMg+jOk0joaBNSGX6+wqB4= -github.com/aws/aws-sdk-go-v2/service/iam v1.59.0/go.mod h1:Wm74PIQWDrV2tGPFYtwLqh8jZ7JU/rnq/leiC6UI4dg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.16 h1:iE4NGbvqUZnHDqddQAauZzCILYtFjOHwRM5MOOKLB5A= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.16/go.mod h1:VsjEgrP+ibcou8TlWA4tYaB+0OojuhirsmCe+U60hTA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.29 h1:E65Hj648dOV6FuUfI0mYXXhQRHbsi7n+B9h6fZPJO/E= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.29/go.mod h1:xLrF9yNTCs92VZSpdEd68EJbgcdw3SMR74RO6QDzWHE= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.13 h1:nAmSoKdE+MqyoA/U7279w/C2oT5C8yfFFqr6hgjM/fs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.13/go.mod h1:wZqx4Cfe2bX1QRclO6kCX1ZX1fJf2qLmJ22bjbwm2iY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.36 h1:fx2ujmozWn+C/GtfXfz5k6Ckzza40ElOpIW7d92fLWQ= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.36/go.mod h1:QT2ufGVJ+xTRxtXPHTQ1kHkAdWIKPCmD+BqYAXWv8/4= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.37 h1:KGHa9iZCrgtkOsFfXb0S4ywsjostA/hau7WE9aSb43E= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.37/go.mod h1:FV79f0DSnZIEGsQjWenENGtUycrasyAaJZO+zRanLHA= -github.com/aws/aws-sdk-go-v2/service/kms v1.55.5 h1:49KDQ1f+uLd4TjJiQYygh4S8MbS9sMzwXX1GsTiUKYU= -github.com/aws/aws-sdk-go-v2/service/kms v1.55.5/go.mod h1:+Gq7FXsWQj7NSyBubSxmKN0yM713GYudgGnJIpuNqOo= -github.com/aws/aws-sdk-go-v2/service/lambda v1.101.3 h1:JxKvYBJCfQ+v2IDHxoE9TAjPs8MwFPuRL29fZxVEez4= -github.com/aws/aws-sdk-go-v2/service/lambda v1.101.3/go.mod h1:Sib34fFU1S2xI6Ft3xEdhCjwKoh3z5GREnIGAOYVXos= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.67.2 h1:K6mR9GrL+tgFveAOCB8lhMOB1unLM1VbpCGgSGBCOOo= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.67.2/go.mod h1:rXH0aAYHnc2G808Yud13BROLntl0HyOckiwZz6zYGXs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.44.5 h1:5nWKi6g7jpZx1+XFRijA8wI9I5jAtufR3CGnrTCDT+Y= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.44.5/go.mod h1:6tVwU8DRm1ZGY4sZMEktlLiQfNu8goAy6W/j2aano7c= -github.com/aws/aws-sdk-go-v2/service/rds v1.124.2 h1:qYCAcSBUzQQWUUu7d9AkaJpFB9khH+YV2k+xtPgACtM= -github.com/aws/aws-sdk-go-v2/service/rds v1.124.2/go.mod h1:wUePd59AnbMaomGj+e6NrvJtWG+zY9EefvmCvU9sZ3E= -github.com/aws/aws-sdk-go-v2/service/route53 v1.65.7 h1:UOoL3uUHKk5LFMlaDN8SZa5IKMFPGrKI4ff5I77xLEw= -github.com/aws/aws-sdk-go-v2/service/route53 v1.65.7/go.mod h1:Mr0ZxxRxQlWlr+iUu8ie9F4n6KUrwir5LdW9Txa88L8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.107.1 h1:VUTtUJMuRNMkb/7NIKmd8NQaeQLPGCMoTJxkYKre4qM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.107.1/go.mod h1:WvUaO0lP5GNMs1R6cs6qvB3mqo16GLta8yfOuf55Rpc= -github.com/aws/aws-sdk-go-v2/service/signin v1.5.5 h1:0VTFBfOgPJrUSpGMgzoi8qLcXF5dbmiBuxpo14eBWUw= -github.com/aws/aws-sdk-go-v2/service/signin v1.5.5/go.mod h1:sNZYlBxoohYMBYl47BO/bFtAM6I8HSsPa1qwwPPRGoQ= -github.com/aws/aws-sdk-go-v2/service/sns v1.42.5 h1:k+1z0Pz6TND5uLttJyXf06ao+8X1vevN15bIaa11wkE= -github.com/aws/aws-sdk-go-v2/service/sns v1.42.5/go.mod h1:5r2Nsw6AeYMKtNpxujt9SBFoAKPC411QiyUO4zvAriE= -github.com/aws/aws-sdk-go-v2/service/sqs v1.46.5 h1:k/vdm0VvoLYjwCMXhfgFa0u93QygN//dIAud2m4w51g= -github.com/aws/aws-sdk-go-v2/service/sqs v1.46.5/go.mod h1:TCFydwE7dFonXP+kd641caqfCIXWVdh+tFAu5V5Seks= -github.com/aws/aws-sdk-go-v2/service/ssm v1.73.5 h1:b6t4ebbd9Jxmdb1/993JoB2ddaJzRBdK/geJGHfX9jo= -github.com/aws/aws-sdk-go-v2/service/ssm v1.73.5/go.mod h1:hXZFSldJTdhJpScM8gUpOyEs8OFw9cegOQpm3opVITY= -github.com/aws/aws-sdk-go-v2/service/sso v1.33.5 h1:jDQARFp1mJ2PEnllQf01nfFXGfWMJ59e0/HCHUTTZCk= -github.com/aws/aws-sdk-go-v2/service/sso v1.33.5/go.mod h1:OcT2AhgTuxGAwZk5hgxaNLGpS33W8s8dUQadGVDVY9I= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.5 h1:8xo1q9ttkYqMJ6vOXX67FPSpVEI7BWKVTKh77g82w+8= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.38.5/go.mod h1:hbBeEUrZg6VddXYZpbKPyF0tl4XEnM+Dbx92RW3vmZI= -github.com/aws/aws-sdk-go-v2/service/sts v1.45.5 h1:eQ5BtXDrPg2wK0AjtVPzeBhUpYPeqHE/ptiH7xJRGek= -github.com/aws/aws-sdk-go-v2/service/sts v1.45.5/go.mod h1:f9ImhnOISY7BuTZLM8qHepCYnglHBVLk5wVzatmP++w= -github.com/aws/smithy-go v1.27.7 h1:Zgj5z4LfcDYoQIVk+n/yGdTkP/2y6ZT5vYxe0fp7bqE= -github.com/aws/smithy-go v1.27.7/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= -github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= -github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/aws/aws-sdk-go-v2 v1.45.1 h1:iIoG3NaLhV6UZpPXyPXlDj2I9oS8tV/nMcMnITCC6Ks= +github.com/aws/aws-sdk-go-v2 v1.45.1/go.mod h1:bttEH6JqnUL8LepvDVfdrds/fZ5bCIxzpe3abyUrhDU= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.20 h1:GPRlPwz40I2B2VrBEASOA3Bi77NyeqejNLkifosX0rs= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.20/go.mod h1:g7PNzKcsOKWb4fkSRBA7BZVAS6Y8IcxzN+nRohhQ1Q8= +github.com/aws/aws-sdk-go-v2/config v1.33.2 h1:Pj4+nF2kc4Z+1BJysVPnX9d5dMN7IYFXR4UJaWK2IpA= +github.com/aws/aws-sdk-go-v2/config v1.33.2/go.mod h1:Igw+HTwbR2tsTU/ydifAS9EHAFJ2s/FCgkwQWFnAdE4= +github.com/aws/aws-sdk-go-v2/credentials v1.20.2 h1:VQjZODPNfdikCX2ZZrltw4zNLkcwjyUFDUl2vT9yTwg= +github.com/aws/aws-sdk-go-v2/credentials v1.20.2/go.mod h1:OmeHCn28vZylsBvalLDf7t8fuJ2rHYQprJs+7WuxniI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.19.1 h1:YIEBqcqRnpi4Pfv0YHImtgi6czGCwKHANC7SwmUAVD0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.19.1/go.mod h1:imEf0oufgAo8KAkCHhrOdqGEC0YWx1PPBQH82shSxGw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.1 h1:pc138gM1CW+XPc60rEwUlwwuwWFQK16CI1T7v1F9Oec= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.1/go.mod h1:1+koxpPIbfBdfzP6vojm5/zTpTQ/micYwlxIiNB3TxI= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.1 h1:K0JsbZQj+1h208Ro1zHeA4l7bMp0NvRffHQ91q8Ol1s= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.1/go.mod h1:W3/vL6EtCIatICGy9ab29QhMuae+cOKPWcMxv02CO+Q= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.1 h1:yhw5KD1phVyP9vijxOUzDfEtJx+bt+L63k+VfuiYFAA= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.1/go.mod h1:ZW2e0d7DYlRxlS9hEiMXE47gTdX5KRN4byUiNbUpG+Q= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.45.0 h1:TbK9xVr4ifazs8CRakBLFliq4hKbwwxDOiJtYDar9i4= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.45.0/go.mod h1:qh6CFDnQ0mQoza4c9b2Tls+QALP+Kbz4b9hQDdkoVR8= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.76.0 h1:iV8RGJWF/iHjYo/+vFHE6AUKFd2cFvy//QJ+vCfuoAY= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.76.0/go.mod h1:wh20TPxjGHR8c/e3+NIZTNzMsrTlkSXODJnxIaaf5a0= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.71.0 h1:lQDXpYPSTK6RKCLhs5YzDpi5xfhFJoMHqU9DQBumC74= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.71.0/go.mod h1:ifIxru9dAFy5sUgWbVcsiZvZ3G0UkC86RJhwu1N7acg= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.70.0 h1:rM/fsht9hzb/0Iq3S/+0tM9SwneQ/zV3DmzHrYsbPtk= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.70.0/go.mod h1:rmlhLCdedUIhyhhkK9E2BBqHiaUpsmb0Yg7S58r6aaE= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.48.0 h1:ELh1PVfMnrS7kF3KW6c0y0S8+KoXbB2o7MRFmjGd6+8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.48.0/go.mod h1:+kTKWFIeenzuSKmAEVUktVX9yTzvxQ8QyUMd5LmmGko= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.66.0 h1:Iz90Uc1I8Yx/EVZMVEdB3SuLRkOJYY1YUUU0hTV7AFo= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.66.0/go.mod h1:1n7X9A0OjJ8CZjeac5PsFxEkIzBioOs223JPLDZ5bbQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.325.1 h1:rL19vNlxMMJHDSbX5JAwnpR/94kRgcebkdFRvmG6MWM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.325.1/go.mod h1:M8AJ/M7737nKBNqZvXUNrADGBy+d3PNggJGmAStCWxI= +github.com/aws/aws-sdk-go-v2/service/ecs v1.94.0 h1:ey3kjfy8T1lXxJNBGrQFkDghtaCNpFVvF6/0bS9ONa8= +github.com/aws/aws-sdk-go-v2/service/ecs v1.94.0/go.mod h1:SWnb6UqGrRl+8szKjonPFm9cO31HpS9NdqdOLXS9vbA= +github.com/aws/aws-sdk-go-v2/service/efs v1.47.0 h1:jxeZyjWoHkZgTpw0ca/U6G9DOHwGwLeOVsBzmTNfmYI= +github.com/aws/aws-sdk-go-v2/service/efs v1.47.0/go.mod h1:5vY8S4D3FzAn29Z35KaPubhF0Agn+HJKmLj4S4fAb8g= +github.com/aws/aws-sdk-go-v2/service/eks v1.96.0 h1:nIaOY6WlURW/8YP0lu8OBNHPl24/biUxe/C6pZ96g1w= +github.com/aws/aws-sdk-go-v2/service/eks v1.96.0/go.mod h1:VW9+jZicSbAPGHczf4tlIwgjkNT+5KXYYDbz/PxsRTs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.39.0 h1:2Y2r9Bw7aNnz5qRbaP3Rplel6qYxLRx4drFfAd1tTG0= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.39.0/go.mod h1:rp/ZIrMxsdYHnUW9urnQ5EroaDmT1OJAg1Pc9LF8eWI= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.61.0 h1:3MhPsMbnugRPmJMqKzt6pEm1YLUBCT1/G2w9eQGxQJc= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.61.0/go.mod h1:dbj7M5O7ef265rCf1cDRUBHFlZxKS9HErEs4EZ61mYc= +github.com/aws/aws-sdk-go-v2/service/iam v1.62.0 h1:pMq9Wvwbxre0ALXgh6wesNH3+92DaGzAle38t2V0ucU= +github.com/aws/aws-sdk-go-v2/service/iam v1.62.0/go.mod h1:k0YVlnUF0eaJtm8g0VcFDn9LVfK38XdrXTHRd/EeflQ= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 h1:bAdDl/HkGCcGPoe25ToSHEw23VIxt6CT5fLcg111BKg= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19/go.mod h1:KaUzbLxv4CeSxh6ZCl9B4m7CuFenS8kUEaDs+f/DQr4= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.1 h1:s67hBfG5t9rn1NCvDuB4E3QIep3UFhHPtaIqFDjV3N8= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.11.1/go.mod h1:FpvjBMXtSNMLPmDJsWwcY5cRnqJlpS2y1R6n4pvzs4k= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.13.1 h1:kIfDHRmq8zgw3DB0XxzGTZi19BX7OwIn+yDE9BJ2I1g= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.13.1/go.mod h1:o6YX/HIkSNfumuKUum+FrqrsebMFVJUiGcmGp03WnsQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.1 h1:RmmWQPREQdk9U+PfqeHW3MqZaBaNK7TpV9W3RY+b+7g= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.1/go.mod h1:0A3W4F+68ZnNk5XcNL/e9HFMwnP8RlEicFfy6eOEDyw= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.1 h1:ZMbtPZZQRca+3+XYQne9PBvRiYpHZlNJJOZfE9WNfT0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.20.1/go.mod h1:YAGWQdCYlVCoqrzvfv3RLxO6zKwti7gsAULOGWPLYv4= +github.com/aws/aws-sdk-go-v2/service/kms v1.58.0 h1:GZ3wgDnjZcp4S8QhUAjis4VUKy+f4QonFKyNpihJGKU= +github.com/aws/aws-sdk-go-v2/service/kms v1.58.0/go.mod h1:EzyGQwPscu9Pwk4XJx5PrG0g8Wxtc2sv8ullQP1NIJA= +github.com/aws/aws-sdk-go-v2/service/lambda v1.105.0 h1:r8DNdTvtXb/NbTo43ZBcm4WQQvOfKMpwTRlzj4lF4EA= +github.com/aws/aws-sdk-go-v2/service/lambda v1.105.0/go.mod h1:xFO5LMHsvX9T3B9lLauhTYYyYSCoCn46gxiqpVfK+Sw= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.70.0 h1:m3z4LJwmiaXqBRv4TjUfu1nl9XTC7Pi16lkQ463S8U0= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.70.0/go.mod h1:Hm6ojpNP9jCfxl/poownA5XSwDMs+ioeP5JNo9WRL4M= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.48.0 h1:gD1Ur7+BWPss+5oyFiB8ytiLH8EmUZD1+JdysmTU+Vo= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.48.0/go.mod h1:+U7DACNnzA1ltESgwKPR1oDOtlQi2mDgfDRXveVnffo= +github.com/aws/aws-sdk-go-v2/service/rds v1.127.0 h1:2gvvl35gt7EteixPgFptH17SdoMck/aJWpBSeiOZwLI= +github.com/aws/aws-sdk-go-v2/service/rds v1.127.0/go.mod h1:XNgrAl4ZWN+hcqRfH5/AY6rENRBCMzcEDAIhD0OM01o= +github.com/aws/aws-sdk-go-v2/service/route53 v1.68.0 h1:TyYPOR7yYTQmdj/CPoGu3ccj3yNrOT/yQh541mYaygg= +github.com/aws/aws-sdk-go-v2/service/route53 v1.68.0/go.mod h1:s/AxBtquPdiAFPFBm1G2WXZBCfA4Hpaml3JwMMpJEeQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.110.0 h1:He8vaTTqAAJrux/KdpjFXNWueLJZyKqE49QEXoqAu4I= +github.com/aws/aws-sdk-go-v2/service/s3 v1.110.0/go.mod h1:CUr46sCpGAg/rHaclRyhJX0LJAmH73uWSJPPSaMUrSk= +github.com/aws/aws-sdk-go-v2/service/signin v1.8.0 h1:bSvKIoLuRGFqGwASgeCQncCJDi9YKKBDEmCEZzOX1uU= +github.com/aws/aws-sdk-go-v2/service/signin v1.8.0/go.mod h1:9IqUlsJDbUPcg6cgx3WEzXdjrbWzLDQrak0aaSqlTcI= +github.com/aws/aws-sdk-go-v2/service/sns v1.45.0 h1:6CE6OJphrV+SW+s4sUGuZXWbhBhrGGd5vf6C6zk4ZGA= +github.com/aws/aws-sdk-go-v2/service/sns v1.45.0/go.mod h1:ucBUMGW8avqGmbyQoXyoC6Cgt+WsNBrhL9DA4Bb+jN4= +github.com/aws/aws-sdk-go-v2/service/sqs v1.50.0 h1:iyOnIecB0y4rkOi4zeZO8iknl9h27cDCFW1tLP7HaKw= +github.com/aws/aws-sdk-go-v2/service/sqs v1.50.0/go.mod h1:d4DToDhLnEofHKvFu4yCF0Be65pZW267COfKOztsZOQ= +github.com/aws/aws-sdk-go-v2/service/ssm v1.76.0 h1:hdrI7EQp8HQzmxSwsXsWhjo7AwcVsw8rC/5AOCiDwQ4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.76.0/go.mod h1:l+OkBEbZ5r0XEHQ+R7c27Zw3LO89fau+FBxsDoAW1TU= +github.com/aws/aws-sdk-go-v2/service/sso v1.36.0 h1:iivsh357VnfIc18IFWSuoyQEluf8frfWf4cL2Y0JUQw= +github.com/aws/aws-sdk-go-v2/service/sso v1.36.0/go.mod h1:tWuiVBUtPBr8/rgRiYS8Uf85sHcAN+G7XS3D3CEoUh8= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.41.0 h1:wVxM3QzSKIK8tSN6OGgezp9OK91lCLH2zhmRInN9rFM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.41.0/go.mod h1:naFe83jSMuYkH+QjQPX8n1MLhBkeCFM5Lsnh5m5wz3c= +github.com/aws/aws-sdk-go-v2/service/sts v1.48.0 h1:RzZVCzYM19vhJCT5s6vO2wN8ie770Li/TmbAZ9B6N7E= +github.com/aws/aws-sdk-go-v2/service/sts v1.48.0/go.mod h1:mKo/CzaCz8qytGW70NG4vIIGAx1HXTlb5lHNkC5k3lk= +github.com/aws/smithy-go v1.28.1 h1:R/nXH00c8qcfCzQVELtRw+eLQWtzv+VAIEFJ1/xxXlQ= +github.com/aws/smithy-go v1.28.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o= github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= @@ -275,20 +275,16 @@ github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/ github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= +github.com/cenkalti/backoff/v7 v7.0.0 h1:ZP+QAaaOnVUHo+ufFpZ835hbT3x2fy+h2lecVEosZ6A= +github.com/cenkalti/backoff/v7 v7.0.0/go.mod h1:qcKBGwsu4hpxHtQ8tWYsQ+ifzx2+sS+Xx/3jfe30lI8= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q= github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q= -github.com/charmbracelet/glamour v0.10.0 h1:MtZvfwsYCx8jEPFJm3rIBFIMZUfUJ765oX8V6kXldcY= -github.com/charmbracelet/glamour v0.10.0/go.mod h1:f+uf+I/ChNmqo087elLnVdCiVgjSKWuXa/l6NU2ndYk= -github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 h1:ZR7e0ro+SZZiIZD7msJyA+NjkCNNavuiPBLgerbOziE= -github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834/go.mod h1:aKC/t2arECF6rNOnaKaVU6y4t4ZeHQzqfxedE/VkVhA= github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 h1:rdnVWKgJpTVXKuKuJyxDJ+NFJdUaUqGvyGy61OcvlbA= github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886/go.mod h1:nAw0d9PhFp1qdzi2xhQU5YOu5sVpDIHWlaW2Uz/bCro= github.com/charmbracelet/x/ansi v0.11.8 h1:JMFwp0CgDC2+jcOB162HH5k7I3FVbgFSMMYg7dSPBQQ= github.com/charmbracelet/x/ansi v0.11.8/go.mod h1:ZNN+3mXny/516oTQPLMPIBeSINvNJJQ8uQXDgbeJxY0= -github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI= -github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q= github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA= github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I= github.com/charmbracelet/x/exp/slice v0.0.0-20250417172821-98fd948af1b1 h1:8fUBSeb8wmOWD0ToP8AJFhUCYrmR3aj/sLECrLGM0TI= @@ -318,8 +314,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 h1:5RVFMOWjMyRy8cARdy79nAmgYw3hK/4HUq48LQ6Wwqo= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes= @@ -374,8 +370,8 @@ github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U= github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= -github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU= +github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= @@ -408,10 +404,10 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.3.19 h1:mMOE7DN2+p76/EdIrmAy9B9bH+yC4563vmnJ34QR8i4= -github.com/googleapis/enterprise-certificate-proxy v0.3.19/go.mod h1:rSEsBUemEBZEexP2y6jPp16LUmUbjmSbcPMQizR0o4k= -github.com/googleapis/gax-go/v2 v2.23.0 h1:Tchl7qkvE7Ip3y+ztvNufYFvkfqTe7NfLTYGIdJRLuE= -github.com/googleapis/gax-go/v2 v2.23.0/go.mod h1:rBQKOVJCdb8IFEzg+FCwlt1LP/xMDGuqUXhUG+XMXEg= +github.com/googleapis/enterprise-certificate-proxy v0.3.20 h1:t/xL64VUoN69MuMRQuJETqYGOw4Z9mSRJK9epIEtwFk= +github.com/googleapis/enterprise-certificate-proxy v0.3.20/go.mod h1:L3D/IQExI6LqEjBdXcZQ1WluSgigQmSwBboFstVPM4w= +github.com/googleapis/gax-go/v2 v2.24.0 h1:myMaPYyF9MecEmvQqMqomIwn9t/4KCZN9qnwsS76wlg= +github.com/googleapis/gax-go/v2 v2.24.0/go.mod h1:IaTHBDd7NHxSCiu0vEs8pQZu4dGZrWwuSoxCnk16OFM= github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0= github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E= github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA= @@ -543,8 +539,8 @@ github.com/micahhausler/aws-iam-policy v0.4.4 h1:1aMhJ+0CkvUJ8HGN1chX+noXHs8uvGL github.com/micahhausler/aws-iam-policy v0.4.4/go.mod h1:H+yWljTu4XWJjNJJYgrPUai0AUTGNHc8pumkN57/foI= github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA= -github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= -github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= +github.com/miekg/dns v1.1.73 h1:uhT8nJxmTrPJYClxVxTCX+CVn6qnzSiybRk72Z6DgrE= +github.com/miekg/dns v1.1.73/go.mod h1:RW2Obtfd5NZHvOFe3zYG0W8koWOQtAzyHaLo8vASBuQ= github.com/minio/highwayhash v1.0.4 h1:asJizugGgchQod2ja9NJlGOWq4s7KsAWr5XUc9Clgl4= github.com/minio/highwayhash v1.0.4/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= @@ -569,14 +565,12 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= -github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= -github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/jwt/v2 v2.8.2 h1:XXRgB60MSTnqsRwejQurVDs/hcv2dkt+86GjI+I/bMc= github.com/nats-io/jwt/v2 v2.8.2/go.mod h1:Ag/56sq9OblL4JgdYufDd16Egb17Kr/8WwwuO/forVc= -github.com/nats-io/nats-server/v2 v2.14.5 h1:M6yeo/Xb7khi97RSEVELof3DForDqmYza3P4tHCPFWw= -github.com/nats-io/nats-server/v2 v2.14.5/go.mod h1:1D3iocrisKvWaD1B/imqarTqmaGrWMqALMLbEDo3v7Q= +github.com/nats-io/nats-server/v2 v2.14.6 h1:dHjEHa49lUTxIb5jrsk5kz/AmOyOQ4T9ti8djcBumDQ= +github.com/nats-io/nats-server/v2 v2.14.6/go.mod h1:u/0bNBzN/m5orQGz7q2NNzxCQ6PWdwaOSwPNDADZn/A= github.com/nats-io/nats.go v1.53.1 h1:Otsq3uLc/kLdjmkNHkXH0jBqwUquwdKFoe3fq6/3/Xo= github.com/nats-io/nats.go v1.53.1/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno= github.com/nats-io/nkeys v0.4.16 h1:rd5oAuLOb8mnAycB0xleuEBNS1pVVnN0fv/FF34Eypg= @@ -627,8 +621,8 @@ github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0= github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/sirupsen/logrus v1.10.0 h1:T8MxJJXVZkfcC5zSRMRAg2F8+lxjmUCGGWPzFxO+Msc= -github.com/sirupsen/logrus v1.10.0/go.mod h1:FXZFonkDAnFozmO+5hGAFvB0Yg9/j2SIhA/QuIkP180= +github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= +github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8= github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= @@ -649,8 +643,9 @@ github.com/spiffe/go-spiffe/v2 v2.7.0/go.mod h1:47Q0Q9/AqGha8QLHp+kxpH4Wca7X7EnO github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4= +github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -658,8 +653,9 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4= @@ -760,8 +756,8 @@ golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1i golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk= -golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40= +golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= +golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -793,8 +789,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/telemetry v0.0.0-20260708182218-49f421fb7959 h1:RJhm5l6Fo4rmEIcndxDllNhhf/fAx8qIm4t6A7vpm2A= -golang.org/x/telemetry v0.0.0-20260708182218-49f421fb7959/go.mod h1:LV7u5Oco+Z/g6XI7PqN+EUUUGGkEcmB1uj2ceI0fOVg= +golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 h1:ZUSxONxc981v7AW7QUg+I9WwZzSTTJ019ENBYr5pV/Q= +golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5/go.mod h1:LVehoXe41cL5SCVQilsV7Gg6BNG+Js6P9PhSbYTIUkQ= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -814,27 +810,27 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE= -golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY= golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/api v0.292.0 h1:Ewiwo/GTtiaPZSNAZQUcWLh8AYDEoPmIXyJfeoTSMHU= -google.golang.org/api v0.292.0/go.mod h1:07kjmMnFGm2RQuCza2EZM/5N68G/fVvFb1xKjWqoFA0= +google.golang.org/api v0.293.0 h1:p9XIWOf63U4OgYx120ZwVU8+vl4XTPmWfgVPnmOAS9w= +google.golang.org/api v0.293.0/go.mod h1:6n5tjEB1gzwniZTepZ0g5u+wM7Bof5GeULCx/zh8ZE0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto v0.0.0-20260519071638-aa98bba5eb94 h1:YJjbgu+dkp5kUJLfpMyCLfBIWZb/FcJyuLeo1gVBOuo= -google.golang.org/genproto v0.0.0-20260519071638-aa98bba5eb94/go.mod h1:RRHjglSYABVCWpQ7USCpdfhcd9t4PkajvVwyynZizTc= +google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d h1:C9v1o0/4quuhOAfmRXA2j+we0PqZIp8traLdeogF3Ms= +google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d/go.mod h1:Wz2wFJntZFmLGo7pLDXZ3wYk5hyc0Mb+SkHhDDXT+lU= google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d h1:FarXi840EJWSHYTN3ERkADbPWjl307+FGrA22KAVjjc= google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260810153831-ec0a7760b754 h1:k5CJw9e5ONCcA/u0webKt092npXuY+KeGh3Q8NAVf0g= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260810153831-ec0a7760b754/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= -google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 h1:cYNAzI2sUwhmCcoj9TxvihSrqsxt6uIkj3rDRhSDmW4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= +google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU= +google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc= @@ -855,12 +851,12 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.36.3 h1:NxB+05W2UGqXWFXcLO0RB5cnqnUPP5v5sVlaOH0Iz4w= -k8s.io/api v0.36.3/go.mod h1:JzLQKqRHC5+I8RVj/lS3lCg0mg6nWI9Fo/Sk3ElxHzg= -k8s.io/apimachinery v0.36.3 h1:PkzMRBRG8joFD8EhCuQAtNPvJlxb82FwplP26HIzvAM= -k8s.io/apimachinery v0.36.3/go.mod h1:cTSjBWgPe/6CQyBKzY/hDIRWCQQQeK0mfLbml0UYFHE= -k8s.io/client-go v0.36.3 h1:M4JdVzXxYcZk4fGpfDdYnxSwhLKWCFoQsHW6t+z8Hfg= -k8s.io/client-go v0.36.3/go.mod h1:gcPwr0c87vjjG6HB6pWEqOeuYVoXSsREjzux2j6GF30= +k8s.io/api v0.36.4 h1:RxrvqCL6vgH5/+UnTeu1IIFqYmGfy0hnyrod1rn35Oo= +k8s.io/api v0.36.4/go.mod h1:S2B3orCFBDhrgyWbLeuKcT2QdHIpQesBkCYSlWtwUOw= +k8s.io/apimachinery v0.36.4 h1:PT2UzkupGuAx/+xT5XjiMJ1WGpY3fn9/hdAvjweRet4= +k8s.io/apimachinery v0.36.4/go.mod h1:p2I2dipt7JHG+quVwQ1d02d28O4GdDi77RByQ13MTpk= +k8s.io/client-go v0.36.4 h1:MDvfDNvMSt0Br94SK8neviVlwL9qifw9B26hJCpD1K0= +k8s.io/client-go v0.36.4/go.mod h1:pNK4WKELbwlEDvtbE8l22lEZL5THYF61H5EealokZmA= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg= diff --git a/go/auth/mcpoauth_test.go b/go/auth/mcpoauth_test.go index 44f8bf89..82301867 100644 --- a/go/auth/mcpoauth_test.go +++ b/go/auth/mcpoauth_test.go @@ -36,21 +36,7 @@ func TestNewMCPOAuthMetadataHandler_RouteFamilyAliasContracts(t *testing.T) { "/.well-known/openid-configuration/oauth", "/oauth/.well-known/openid-configuration", }, - forbidden: []string{"/brent/", "brent:read", "brent:write"}, - }, - { - name: "legacy Brent", - issuer: "https://until.example.com/brent/oauth", - registrationEndpoint: "https://until.example.com/brent/oauth/register", - authorizationEndpoint: "https://until.example.com/brent/oauth/authorize", - tokenEndpoint: "https://until.example.com/brent/oauth/token", - scopes: []string{"account:read", "brent:read", "brent:write"}, - aliases: []string{ - "/.well-known/oauth-authorization-server/brent/oauth", - "/brent/oauth/.well-known/oauth-authorization-server", - "/.well-known/openid-configuration/brent/oauth", - "/brent/oauth/.well-known/openid-configuration", - }, + forbidden: []string{"/brent/"}, }, } @@ -247,14 +233,7 @@ func TestNewMCPPRMHandler_RouteFamilyContracts(t *testing.T) { authorizationServer: "https://until.example.com/oauth", resource: "https://until.example.com/mcp", scopes: []string{"account:read", "until:read", "until:write"}, - forbidden: []string{"/brent/", "brent:read", "brent:write"}, - }, - { - name: "legacy Brent", - path: "/.well-known/oauth-protected-resource/brent/mcp", - authorizationServer: "https://until.example.com/brent/oauth", - resource: "https://until.example.com/brent/mcp", - scopes: []string{"account:read", "brent:read", "brent:write"}, + forbidden: []string{"/brent/"}, }, } @@ -300,11 +279,11 @@ func TestNewMCPOAuthMetadataHandler_Overrides(t *testing.T) { scopes := []string{"openid"} handler := NewMCPOAuthMetadataHandler( "auth.example.com", - "https://api.example.com/brent/oauth", - "https://api.example.com/brent/oauth/register", + "https://api.example.com/oauth", + "https://api.example.com/oauth/register", scopes, - "https://api.example.com/brent/oauth/authorize", - "https://api.example.com/brent/oauth/token", + "https://api.example.com/oauth/authorize", + "https://api.example.com/oauth/token", ) req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metadata", nil) @@ -315,10 +294,10 @@ func TestNewMCPOAuthMetadataHandler_Overrides(t *testing.T) { if err := json.NewDecoder(rec.Body).Decode(&body); err != nil { t.Fatalf("decode: %v", err) } - if body["authorization_endpoint"] != "https://api.example.com/brent/oauth/authorize" { + if body["authorization_endpoint"] != "https://api.example.com/oauth/authorize" { t.Errorf("authorization_endpoint = %v", body["authorization_endpoint"]) } - if body["token_endpoint"] != "https://api.example.com/brent/oauth/token" { + if body["token_endpoint"] != "https://api.example.com/oauth/token" { t.Errorf("token_endpoint = %v", body["token_endpoint"]) } } diff --git a/go/auth/middleware_test.go b/go/auth/middleware_test.go index 9313b989..65bde55f 100644 --- a/go/auth/middleware_test.go +++ b/go/auth/middleware_test.go @@ -174,12 +174,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with insufficient scopes", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:fail", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:fail", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusUnauthorized, @@ -188,12 +186,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with correct scopes but wrong account", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "fail", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "fail", + Scope: "test:pass", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusUnauthorized, @@ -202,12 +198,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with correct scopes and account", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusOK, @@ -216,12 +210,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with the correct scope and many others", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass test:fail foo:bar something", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass test:fail foo:bar something", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusOK, @@ -230,12 +222,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with many audiences and many scopes", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech", "https://api.overmind.tech/other"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass test:other", - }, + Audience: []string{"https://api.overmind.tech", "https://api.overmind.tech/other"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass test:other", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusOK, @@ -244,12 +234,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with many audiences and one scope", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech", "https://api.overmind.tech/other"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech", "https://api.overmind.tech/other"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass", }, AuthConfig: defaultConfig, ExpectedCode: http.StatusOK, @@ -258,12 +246,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with good token and some bypassed paths", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass", }, AuthConfig: MiddlewareConfig{ IssuerURL: jwksURL, @@ -288,12 +274,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with bad token on a non-bypassed path", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:fail", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:fail", }, ExpectedCode: http.StatusUnauthorized, AuthConfig: bypassHealthConfig, @@ -302,12 +286,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with bad token on a bypassed path", Path: "/health", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:fail", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:fail", }, ExpectedCode: http.StatusOK, AuthConfig: bypassHealthConfig, @@ -316,12 +298,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with a good token and bypassed auth", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass", }, ExpectedCode: http.StatusOK, AuthConfig: MiddlewareConfig{ @@ -334,12 +314,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with a bad token and bypassed auth", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(-time.Hour), // expired - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(-time.Hour), // expired + AccountName: "test", + Scope: "test:pass", }, ExpectedCode: http.StatusOK, AuthConfig: MiddlewareConfig{ @@ -352,12 +330,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with account override", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "bad", - Scope: "test:pass", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "bad", + Scope: "test:pass", }, ExpectedCode: http.StatusOK, AuthConfig: MiddlewareConfig{ @@ -370,12 +346,10 @@ func TestNewAuthMiddleware(t *testing.T) { Name: "with scope override", Path: "/", TokenOptions: &TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:fail", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:fail", }, ExpectedCode: http.StatusOK, AuthConfig: MiddlewareConfig{ @@ -487,13 +461,11 @@ func TestNewAuthMiddleware_PreservesMCPGrantKeyClaim(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { token, err := server.GenerateJWT(&TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "test", - Scope: "test:pass", - MCPGrantKey: test.mcpGrantKey, - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "test", + Scope: "test:pass", + MCPGrantKey: test.mcpGrantKey, }) if err != nil { t.Fatal(err) @@ -1222,12 +1194,10 @@ func TestAuthMiddleware_PopulatesAuditData(t *testing.T) { ) token, err := server.GenerateJWT(&TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "acme-corp", - Scope: "read:items write:items", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "acme-corp", + Scope: "read:items write:items", }) if err != nil { t.Fatal(err) @@ -1273,12 +1243,10 @@ func TestAuthMiddleware_PopulatesAuditData(t *testing.T) { ) token, err := server.GenerateJWT(&TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "original-acme", - Scope: "read:items", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "original-acme", + Scope: "read:items", }) if err != nil { t.Fatal(err) @@ -1311,12 +1279,10 @@ func TestAuthMiddleware_PopulatesAuditData(t *testing.T) { }, inner) token, err := server.GenerateJWT(&TestTokenOptions{ - Audience: []string{"https://api.overmind.tech"}, - Expiry: time.Now().Add(time.Hour), - CustomClaims: CustomClaims{ - AccountName: "acme-corp", - Scope: "read:items", - }, + Audience: []string{"https://api.overmind.tech"}, + Expiry: time.Now().Add(time.Hour), + AccountName: "acme-corp", + Scope: "read:items", }) if err != nil { t.Fatal(err) diff --git a/go/auth/nats_test.go b/go/auth/nats_test.go index d286245a..558be8d4 100644 --- a/go/auth/nats_test.go +++ b/go/auth/nats_test.go @@ -231,8 +231,7 @@ func TestNATSConnect(t *testing.T) { t.Errorf("Reconnecting took too long, expected <3s got: %v", time.Since(start).String()) } - var maxRetriesError MaxRetriesError - if !errors.As(err, &maxRetriesError) { + if _, ok := errors.AsType[MaxRetriesError](err); !ok { t.Errorf("Unknown error type %T: %v", err, err) } }) @@ -254,8 +253,7 @@ func TestNATSConnect(t *testing.T) { _, err = o.Connect() - var maxRetriesError MaxRetriesError - if errors.As(err, &maxRetriesError) { + if _, ok := errors.AsType[MaxRetriesError](err); ok { // Make sure we have only got one token, not three currentToken, err := o.TokenClient.GetJWT() if err != nil { diff --git a/go/discovery/adapter_test.go b/go/discovery/adapter_test.go index 98f5ebf0..7b8e250e 100644 --- a/go/discovery/adapter_test.go +++ b/go/discovery/adapter_test.go @@ -249,8 +249,8 @@ func TestGet(t *testing.T) { } func TestList(t *testing.T) { - adapter := TestAdapter{} - adapter.cache = sdpcache.NewMemoryCache() + adapter := TestAdapter{ + cache: sdpcache.NewMemoryCache()} e := newStartedEngine(t, "TestList", nil, nil, &adapter) @@ -275,8 +275,8 @@ func TestList(t *testing.T) { } func TestSearch(t *testing.T) { - adapter := TestAdapter{} - adapter.cache = sdpcache.NewMemoryCache() + adapter := TestAdapter{ + cache: sdpcache.NewMemoryCache()} e := newStartedEngine(t, "TestSearch", nil, nil, &adapter) diff --git a/go/discovery/adapterhost_bench_test.go b/go/discovery/adapterhost_bench_test.go index 26454920..25632dfb 100644 --- a/go/discovery/adapterhost_bench_test.go +++ b/go/discovery/adapterhost_bench_test.go @@ -315,11 +315,9 @@ func generateBenchmarkGCPLikeAdapters(projects, regions, zones, typesPerScope in // Project-level adapters for t := range projectTypes { adapters = append(adapters, &BenchmarkListAdapter{ - TestAdapter: TestAdapter{ - ReturnScopes: []string{projectID}, - ReturnType: fmt.Sprintf("gcp-project-type-%d", t), - ReturnName: fmt.Sprintf("adapter-%s-type-%d", projectID, t), - }, + ReturnScopes: []string{projectID}, + ReturnType: fmt.Sprintf("gcp-project-type-%d", t), + ReturnName: fmt.Sprintf("adapter-%s-type-%d", projectID, t), itemsPerList: 10, }) } @@ -329,11 +327,9 @@ func generateBenchmarkGCPLikeAdapters(projects, regions, zones, typesPerScope in scope := fmt.Sprintf("%s.region-%d", projectID, r) for t := range regionalTypes { adapters = append(adapters, &BenchmarkListAdapter{ - TestAdapter: TestAdapter{ - ReturnScopes: []string{scope}, - ReturnType: fmt.Sprintf("gcp-regional-type-%d", t), - ReturnName: fmt.Sprintf("adapter-%s-type-%d", scope, t), - }, + ReturnScopes: []string{scope}, + ReturnType: fmt.Sprintf("gcp-regional-type-%d", t), + ReturnName: fmt.Sprintf("adapter-%s-type-%d", scope, t), itemsPerList: 10, }) } @@ -344,11 +340,9 @@ func generateBenchmarkGCPLikeAdapters(projects, regions, zones, typesPerScope in scope := fmt.Sprintf("%s.zone-%d", projectID, z) for t := range zonalTypes { adapters = append(adapters, &BenchmarkListAdapter{ - TestAdapter: TestAdapter{ - ReturnScopes: []string{scope}, - ReturnType: fmt.Sprintf("gcp-zonal-type-%d", t), - ReturnName: fmt.Sprintf("adapter-%s-type-%d", scope, t), - }, + ReturnScopes: []string{scope}, + ReturnType: fmt.Sprintf("gcp-zonal-type-%d", t), + ReturnName: fmt.Sprintf("adapter-%s-type-%d", scope, t), itemsPerList: 10, }) } diff --git a/go/discovery/adapterhost_test.go b/go/discovery/adapterhost_test.go index 74199b99..74058560 100644 --- a/go/discovery/adapterhost_test.go +++ b/go/discovery/adapterhost_test.go @@ -200,11 +200,9 @@ func TestAdapterHostExpandQuery_WildcardScope(t *testing.T) { // Add wildcard-supporting adapter wildcardAdapter := &TestWildcardAdapter{ - TestAdapter: TestAdapter{ - ReturnScopes: []string{"project.zone-a", "project.zone-b"}, - ReturnType: "wildcard-type", - ReturnName: "wildcard", - }, + ReturnScopes: []string{"project.zone-a", "project.zone-b"}, + ReturnType: "wildcard-type", + ReturnName: "wildcard", supportsWildcard: true, } @@ -322,12 +320,10 @@ func TestAdapterHostExpandQuery_WildcardScope(t *testing.T) { t.Run("Hidden wildcard adapter with wildcard scope is not included", func(t *testing.T) { hiddenWildcardAdapter := &TestWildcardAdapter{ - TestAdapter: TestAdapter{ - ReturnScopes: []string{"project.zone-a"}, - ReturnType: "hidden-wildcard-type", - ReturnName: "hidden-wildcard", - IsHidden: true, - }, + ReturnScopes: []string{"project.zone-a"}, + ReturnType: "hidden-wildcard-type", + ReturnName: "hidden-wildcard", + IsHidden: true, supportsWildcard: true, } diff --git a/go/discovery/engine.go b/go/discovery/engine.go index 7eb759d7..0a3dcc4c 100644 --- a/go/discovery/engine.go +++ b/go/discovery/engine.go @@ -12,7 +12,7 @@ import ( "time" "connectrpc.com/connect" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v7" "github.com/getsentry/sentry-go" "github.com/google/uuid" "github.com/nats-io/nats.go" diff --git a/go/discovery/engine_test.go b/go/discovery/engine_test.go index e50d915e..6db182e6 100644 --- a/go/discovery/engine_test.go +++ b/go/discovery/engine_test.go @@ -215,8 +215,8 @@ func TestNats(t *testing.T) { t.Fatalf("Error initializing Engine: %v", err) } - adapter := TestAdapter{} - adapter.cache = sdpcache.NewNoOpCache() + adapter := TestAdapter{ + cache: sdpcache.NewNoOpCache()} err = e.AddAdapters( &adapter, &TestAdapter{ @@ -630,8 +630,8 @@ func TestNatsAuth(t *testing.T) { t.Fatalf("Error initializing Engine: %v", err) } - adapter := TestAdapter{} - adapter.cache = sdpcache.NewNoOpCache() + adapter := TestAdapter{ + cache: sdpcache.NewNoOpCache()} if err := e.AddAdapters( &adapter, &TestAdapter{ diff --git a/go/sdp-go/errors.go b/go/sdp-go/errors.go index 4bfe3a53..de72c673 100644 --- a/go/sdp-go/errors.go +++ b/go/sdp-go/errors.go @@ -42,8 +42,7 @@ func (e *QueryError) Error() string { // NewQueryError converts a regular error to a QueryError of type // OTHER. If the input error is already a QueryError then it is preserved func NewQueryError(err error) *QueryError { - var sdpErr *QueryError - if errors.As(err, &sdpErr) { + if sdpErr, ok := errors.AsType[*QueryError](err); ok { return sdpErr } diff --git a/go/sdp-go/link_extract.go b/go/sdp-go/link_extract.go index 8041e61b..03f3d98d 100644 --- a/go/sdp-go/link_extract.go +++ b/go/sdp-go/link_extract.go @@ -183,7 +183,7 @@ func extractLinksFromStringValue(val string) []*LinkedItemQuery { // If this is an S3 object ARN (contains /), extract just the bucket if strings.Contains(resource, "/") { - bucketName := strings.SplitN(resource, "/", 2)[0] + bucketName, _, _ := strings.Cut(resource, "/") // Construct a bucket-only ARN for the query val = "arn:aws:s3:::" + bucketName } diff --git a/go/sdp-go/sdpws/client.go b/go/sdp-go/sdpws/client.go index efb59ea2..f179d891 100644 --- a/go/sdp-go/sdpws/client.go +++ b/go/sdp-go/sdpws/client.go @@ -397,8 +397,7 @@ func (c *Client) abort(ctx context.Context, err error) { c.closedMu.Unlock() isNormalClosure := false - var ce websocket.CloseError - if errors.As(err, &ce) { + if ce, ok := errors.AsType[websocket.CloseError](err); ok { // tear down the connection without a new error if this is a regular close isNormalClosure = ce.Code == websocket.StatusNormalClosure } diff --git a/go/sdp-go/validation_test.go b/go/sdp-go/validation_test.go index fba7c509..488dfa99 100644 --- a/go/sdp-go/validation_test.go +++ b/go/sdp-go/validation_test.go @@ -573,8 +573,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -606,8 +605,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -639,8 +637,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -672,8 +669,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -705,8 +701,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -739,8 +734,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -768,8 +762,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -797,8 +790,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -826,8 +818,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -856,8 +847,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -886,8 +876,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) @@ -916,8 +905,7 @@ func TestAdapterMetadataValidation(t *testing.T) { t.Errorf("expected error, got nil") } - var validationError *protovalidate.ValidationError - if !errors.As(err, &validationError) { + if _, ok := errors.AsType[*protovalidate.ValidationError](err); !ok { t.Errorf("expected validation error, got %T: %v", err, err) } }) diff --git a/go/sdpcache/boltstore.go b/go/sdpcache/boltstore.go index 5d92e6c3..aa26f790 100644 --- a/go/sdpcache/boltstore.go +++ b/go/sdpcache/boltstore.go @@ -105,8 +105,7 @@ func fromCachedResult(cr *CachedResult) (*sdp.CachedEntry, error) { if cr.Error != nil { // Try to cast to QueryError for protobuf serialization - var qErr *sdp.QueryError - if errors.As(cr.Error, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](cr.Error); ok { e.Error = qErr } else { // For non-QueryError errors, wrap in a QueryError diff --git a/go/sdpcache/item_generator_test.go b/go/sdpcache/item_generator_test.go index 13a84e82..d00bdd45 100644 --- a/go/sdpcache/item_generator_test.go +++ b/go/sdpcache/item_generator_test.go @@ -6,7 +6,6 @@ import ( "github.com/google/uuid" "github.com/overmindtech/cli/go/sdp-go" - "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -114,9 +113,7 @@ func GenerateRandomItem() *sdp.Item { Scope: scope, UUID: queryUuid[:], }, - Timestamp: timestamppb.New(time.Now()), - SourceDuration: durationpb.New(time.Millisecond * time.Duration(rand.Int63())), - SourceDurationPerItem: durationpb.New(time.Millisecond * time.Duration(rand.Int63())), + Timestamp: timestamppb.New(time.Now()), }, Tags: tags, Health: &health, diff --git a/go/sdpcache/lookup_coordinator.go b/go/sdpcache/lookup_coordinator.go index c898e1f4..d7eaf91c 100644 --- a/go/sdpcache/lookup_coordinator.go +++ b/go/sdpcache/lookup_coordinator.go @@ -105,8 +105,7 @@ func (lc *lookupCoordinator) Lookup( return false, nil, nil, noopDone } - var recheckQErr *sdp.QueryError - if errors.As(recheckErr, &recheckQErr) { + if recheckQErr, ok := errors.AsType[*sdp.QueryError](recheckErr); ok { span.SetAttributes( attribute.String("ovm.cache.result", "cache hit from pending work: error"), attribute.Bool("ovm.cache.hit", true), diff --git a/go/tracing/main.go b/go/tracing/main.go index 5623a13a..8defa6df 100644 --- a/go/tracing/main.go +++ b/go/tracing/main.go @@ -170,7 +170,7 @@ var tp *sdktrace.TracerProvider // sentryEnvironment chooses the Sentry environment label. // -// A non-empty honeycombEnvironment wins. Brent's cobra flag defaults to empty +// A non-empty honeycombEnvironment wins. Until-backend's cobra flag defaults to empty // so an unconfigured local/test/release process keeps the run-mode mapping // below; ServerConfig still defaults empty HoneycombEnvironment to "dev" for // audit-event trace URLs. AWS dogfood/prod overlays set diff --git a/go/tracing/sentry_environment_test.go b/go/tracing/sentry_environment_test.go index 639d1b48..26a8262c 100644 --- a/go/tracing/sentry_environment_test.go +++ b/go/tracing/sentry_environment_test.go @@ -65,7 +65,7 @@ func TestSentryEnvironment_AbsentHoneycombUsesRunMode(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { t.Parallel() - // Empty honeycombEnvironment models Brent's empty cobra default + // Empty honeycombEnvironment models Until-backend's empty cobra default // (or a service that never registers the key). got := sentryEnvironment(tc.runMode, "") if got != tc.want { @@ -76,7 +76,7 @@ func TestSentryEnvironment_AbsentHoneycombUsesRunMode(t *testing.T) { } // TestSentryEnvironmentFromViper_BrentConfigurationPath exercises the real -// Brent wiring after BRENT-651: empty cobra default, BindEnv for +// Until-backend wiring: empty cobra default, BindEnv for // UNTIL_BACKEND_HONEYCOMB_ENVIRONMENT, and BindFlagsToViper's rule of skipping // empty unbound defaults. AWS overlays set the env var; local runs do not. func TestSentryEnvironmentFromViper_BrentConfigurationPath(t *testing.T) { @@ -136,8 +136,8 @@ func TestSentryEnvironmentFromViper_BrentConfigurationPath(t *testing.T) { t.Fatalf("BindEnv: %v", err) } - fs := pflag.NewFlagSet("brent-backend", pflag.ContinueOnError) - // Match services/brent-backend/cmd/root.go: empty default so an + fs := pflag.NewFlagSet("until-backend", pflag.ContinueOnError) + // Match services/until-backend/cmd/root.go: empty default so an // unbound flag is not treated as an explicit honeycomb env. fs.String("honeycomb-environment", "", "Honeycomb environment slug") args := []string{} diff --git a/go/tracing/telemetry_naming_test.go b/go/tracing/telemetry_naming_test.go index ab95fddd..f5114659 100644 --- a/go/tracing/telemetry_naming_test.go +++ b/go/tracing/telemetry_naming_test.go @@ -10,7 +10,7 @@ import ( "testing" ) -// TestNoNewBrentTelemetryLiterals ensures that new brent.* or ovm.brent.* +// TestNoLegacyBrentTelemetryLiterals ensures that new brent.* or ovm.brent.* // telemetry identifiers are not introduced in Go source after the dual-write // wrapper removal (ENG-6186). // @@ -21,11 +21,11 @@ import ( // - Log field keys: WithField("key", ...) // - Span attributes: span.SetAttributes(attribute.String("key", ...)) // -// Non-telemetry identifiers (River job names, URLs, file paths, package -// references, proto field comments) are explicitly allowlisted. +// Non-telemetry identifiers (URLs, file paths, package references, proto +// field comments) are explicitly allowlisted. // // See: ENG-6197, ENG-6186 -func TestNoNewBrentTelemetryLiterals(t *testing.T) { +func TestNoLegacyBrentTelemetryLiterals(t *testing.T) { t.Parallel() // Pattern matching string literals containing "brent." or "ovm.brent." @@ -48,24 +48,12 @@ func TestNoNewBrentTelemetryLiterals(t *testing.T) { } // Allowlist of non-telemetry brent.* identifiers that may remain. - // These are NOT telemetry keys and are allowed to stay: allowlist := []string{ - // River job kinds (internal worker names, not telemetry) - `"brent.workflow_ingest"`, - `"brent.bitbucket_workflow_ingest"`, - `"brent.pr_workflow_check"`, - `"brent.plan_link_check_sync"`, - `"brent.check_run_sync"`, - `"brent.bitbucket_pr_open_comment_sync"`, - `"brent.bitbucket_comment_sync"`, - `"brent.smoke_test"`, - // Test fixture URLs (not actual telemetry emission) - `"https://brent.example`, - `"http://brent.example`, + `"https://until.example`, + `"http://until.example`, // Proto field comments describing legacy attribute keys - // (the comment itself is not a telemetry emission) `"ovm.brent.llm.keySource"`, // File paths and directory references @@ -86,12 +74,8 @@ func TestNoNewBrentTelemetryLiterals(t *testing.T) { // Legacy plan ID prefixes in tests/docs (not telemetry) `"BRENT-"`, - // Span attribute used in old test assertions checking for legacy keys - `"brent.events.eventId"`, - `"brent.invitations.SendInviteEmail"`, - // Test assertions checking for absence of brent prefix - `"brent."`, // Used in strings.HasPrefix checks in tests + `"brent."`, // Used in strings.HasPrefix checks in tests } var failures []string @@ -150,7 +134,7 @@ func TestNoNewBrentTelemetryLiterals(t *testing.T) { // Check if this match is in a telemetry context if isTelemetryContext(line, telemetryPatterns) { relPath, _ := filepath.Rel("../..", path) - failures = append(failures, + failures = append(failures, formatViolation(relPath, lineNum, match, line)) } } @@ -166,7 +150,7 @@ func TestNoNewBrentTelemetryLiterals(t *testing.T) { if len(failures) > 0 { t.Errorf("Found %d new brent.*/ovm.brent.* telemetry literal(s):\n\n%s\n\n"+ "After ENG-6186, all telemetry must use until.*/ovm.until.* naming.\n"+ - "Non-telemetry identifiers (River job names, test URLs, file paths) "+ + "Non-telemetry identifiers (test URLs, file paths) "+ "should be added to the allowlist in go/tracing/telemetry_naming_test.go "+ "with a comment explaining why they are not telemetry.", len(failures), @@ -203,7 +187,7 @@ func formatViolation(path string, lineNum int, match, line string) string { if idx := strings.Index(trimmed, "//"); idx > 0 { trimmed = strings.TrimSpace(trimmed[:idx]) } - + return trimmed + "\n → " + path + ":" + formatLineNum(lineNum) + "\n → Found disallowed telemetry literal: " + match diff --git a/k8s-source/adapters/generic_source_test.go b/k8s-source/adapters/generic_source_test.go index 2635e80a..71bbac81 100644 --- a/k8s-source/adapters/generic_source_test.go +++ b/k8s-source/adapters/generic_source_test.go @@ -30,14 +30,12 @@ func (p PodClient) Get(ctx context.Context, name string, opts metav1.GetOptions) uid := uuid.NewString() return &v1.Pod{ - TypeMeta: metav1.TypeMeta{}, - ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: "default", - UID: types.UID(uid), - ResourceVersion: "9164", - CreationTimestamp: metav1.NewTime(time.Now()), - }, + TypeMeta: metav1.TypeMeta{}, + Name: name, + Namespace: "default", + UID: types.UID(uid), + ResourceVersion: "9164", + CreationTimestamp: metav1.NewTime(time.Now()), Spec: v1.PodSpec{ Volumes: []v1.Volume{ { @@ -77,14 +75,12 @@ func (p PodClient) List(ctx context.Context, opts metav1.ListOptions) (*v1.PodLi return &v1.PodList{ Items: []v1.Pod{ { - TypeMeta: metav1.TypeMeta{}, - ObjectMeta: metav1.ObjectMeta{ - Name: "foo", - Namespace: "default", - UID: types.UID(uid), - ResourceVersion: "9164", - CreationTimestamp: metav1.NewTime(time.Now()), - }, + TypeMeta: metav1.TypeMeta{}, + Name: "foo", + Namespace: "default", + UID: types.UID(uid), + ResourceVersion: "9164", + CreationTimestamp: metav1.NewTime(time.Now()), Spec: v1.PodSpec{ Volumes: []v1.Volume{ { @@ -103,14 +99,12 @@ func (p PodClient) List(ctx context.Context, opts metav1.ListOptions) (*v1.PodLi }, }, { - TypeMeta: metav1.TypeMeta{}, - ObjectMeta: metav1.ObjectMeta{ - Name: "bar", - Namespace: "default", - UID: types.UID(uid), - ResourceVersion: "9164", - CreationTimestamp: metav1.NewTime(time.Now()), - }, + TypeMeta: metav1.TypeMeta{}, + Name: "bar", + Namespace: "default", + UID: types.UID(uid), + ResourceVersion: "9164", + CreationTimestamp: metav1.NewTime(time.Now()), Spec: v1.PodSpec{ Volumes: []v1.Volume{ { diff --git a/k8s-source/build/package/Dockerfile b/k8s-source/build/package/Dockerfile index 28344b95..32f838ab 100644 --- a/k8s-source/build/package/Dockerfile +++ b/k8s-source/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION diff --git a/k8s-source/cmd/root.go b/k8s-source/cmd/root.go index d6385bc9..9294c8a9 100644 --- a/k8s-source/cmd/root.go +++ b/k8s-source/cmd/root.go @@ -17,11 +17,11 @@ import ( "github.com/getsentry/sentry-go" "github.com/overmindtech/cli/go/discovery" - "github.com/overmindtech/cli/k8s-source/adapters" - "github.com/overmindtech/cli/k8s-source/proc" "github.com/overmindtech/cli/go/logging" "github.com/overmindtech/cli/go/sdpcache" "github.com/overmindtech/cli/go/tracing" + "github.com/overmindtech/cli/k8s-source/adapters" + "github.com/overmindtech/cli/k8s-source/proc" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" @@ -192,8 +192,7 @@ var rootCmd = &cobra.Command{ wi, err = watchNamespaces(watchCtx, clientSet) // Check for transient network errors if err != nil { - var netErr *net.OpError - if errors.As(err, &netErr) { + if _, ok := errors.AsType[*net.OpError](err); ok { // Mark a failure attempts++ diff --git a/sources/aws/apigateway-stage.go b/sources/aws/apigateway-stage.go index ef582d8b..e4187ebd 100644 --- a/sources/aws/apigateway-stage.go +++ b/sources/aws/apigateway-stage.go @@ -141,7 +141,7 @@ func (d *apiGatewayStageWrapper) awsToSdpItem(stage types.Stage, scope, query st } } - restAPIID := strings.Split(query, "/")[0] + restAPIID, _, _ := strings.Cut(query, "/") err = attributes.Set("UniqueAttribute", query) if err != nil { diff --git a/sources/aws/errors.go b/sources/aws/errors.go index 2a46d4a2..f1af1450 100644 --- a/sources/aws/errors.go +++ b/sources/aws/errors.go @@ -11,8 +11,7 @@ import ( // queryError takes an error and returns a sdp.QueryError. func queryError(err error, scope string, itemType string) *sdp.QueryError { - var responseErr *awsHttp.ResponseError - if errors.As(err, &responseErr) { + if responseErr, ok := errors.AsType[*awsHttp.ResponseError](err); ok { // If the input is bad, access is denied, or the thing wasn't found then // we should assume that it is not exist for this adapter if slices.Contains([]int{400, 403, 404}, responseErr.HTTPStatusCode()) { diff --git a/sources/azure/build/package/Dockerfile b/sources/azure/build/package/Dockerfile index 0186a194..cdc34c42 100644 --- a/sources/azure/build/package/Dockerfile +++ b/sources/azure/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION diff --git a/sources/azure/clients/application-gateways-client.go b/sources/azure/clients/application-gateways-client.go index 6ba0d285..587dbe0a 100644 --- a/sources/azure/clients/application-gateways-client.go +++ b/sources/azure/clients/application-gateways-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_application_gateways_client.go -package=mocks -source=application-gateways-client.go diff --git a/sources/azure/clients/application-security-groups-client.go b/sources/azure/clients/application-security-groups-client.go index 18fcdb09..5947bc4f 100644 --- a/sources/azure/clients/application-security-groups-client.go +++ b/sources/azure/clients/application-security-groups-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_application_security_groups_client.go -package=mocks -source=application-security-groups-client.go diff --git a/sources/azure/clients/ddos-protection-plans-client.go b/sources/azure/clients/ddos-protection-plans-client.go index 426ef05c..babaa1f3 100644 --- a/sources/azure/clients/ddos-protection-plans-client.go +++ b/sources/azure/clients/ddos-protection-plans-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_ddos_protection_plans_client.go -package=mocks -source=ddos-protection-plans-client.go diff --git a/sources/azure/clients/default-security-rules-client.go b/sources/azure/clients/default-security-rules-client.go index 612876fb..955e1bd8 100644 --- a/sources/azure/clients/default-security-rules-client.go +++ b/sources/azure/clients/default-security-rules-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_default_security_rules_client.go -package=mocks -source=default-security-rules-client.go diff --git a/sources/azure/clients/documentdb-database-accounts-client.go b/sources/azure/clients/documentdb-database-accounts-client.go index 6fd66c2e..8343270a 100644 --- a/sources/azure/clients/documentdb-database-accounts-client.go +++ b/sources/azure/clients/documentdb-database-accounts-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" ) //go:generate mockgen -destination=../shared/mocks/mock_documentdb_database_accounts_client.go -package=mocks -source=documentdb-database-accounts-client.go diff --git a/sources/azure/clients/documentdb-private-endpoint-connection-client.go b/sources/azure/clients/documentdb-private-endpoint-connection-client.go index 6fe021f0..77f8f4b7 100644 --- a/sources/azure/clients/documentdb-private-endpoint-connection-client.go +++ b/sources/azure/clients/documentdb-private-endpoint-connection-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" ) //go:generate mockgen -destination=../shared/mocks/mock_documentdb_private_endpoint_connection_client.go -package=mocks -source=documentdb-private-endpoint-connection-client.go diff --git a/sources/azure/clients/flow-logs-client.go b/sources/azure/clients/flow-logs-client.go index 9c7414f4..ce6843b8 100644 --- a/sources/azure/clients/flow-logs-client.go +++ b/sources/azure/clients/flow-logs-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_flow_logs_client.go -package=mocks -source=flow-logs-client.go diff --git a/sources/azure/clients/interface-ip-configurations-client.go b/sources/azure/clients/interface-ip-configurations-client.go index cd1101e8..2ff4c6b7 100644 --- a/sources/azure/clients/interface-ip-configurations-client.go +++ b/sources/azure/clients/interface-ip-configurations-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_interface_ip_configurations_client.go -package=mocks -source=interface-ip-configurations-client.go diff --git a/sources/azure/clients/ip-groups-client.go b/sources/azure/clients/ip-groups-client.go index 78bd0a8c..b72561c8 100644 --- a/sources/azure/clients/ip-groups-client.go +++ b/sources/azure/clients/ip-groups-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_ip_groups_client.go -package=mocks -source=ip-groups-client.go diff --git a/sources/azure/clients/load-balancer-backend-address-pools-client.go b/sources/azure/clients/load-balancer-backend-address-pools-client.go index e06999a8..271ca566 100644 --- a/sources/azure/clients/load-balancer-backend-address-pools-client.go +++ b/sources/azure/clients/load-balancer-backend-address-pools-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_load_balancer_backend_address_pools_client.go -package=mocks -source=load-balancer-backend-address-pools-client.go diff --git a/sources/azure/clients/load-balancer-frontend-ip-configurations-client.go b/sources/azure/clients/load-balancer-frontend-ip-configurations-client.go index ddae77f7..3cd14405 100644 --- a/sources/azure/clients/load-balancer-frontend-ip-configurations-client.go +++ b/sources/azure/clients/load-balancer-frontend-ip-configurations-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_load_balancer_frontend_ip_configurations_client.go -package=mocks -source=load-balancer-frontend-ip-configurations-client.go diff --git a/sources/azure/clients/load-balancer-probes-client.go b/sources/azure/clients/load-balancer-probes-client.go index 7f16414d..33206da7 100644 --- a/sources/azure/clients/load-balancer-probes-client.go +++ b/sources/azure/clients/load-balancer-probes-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_load_balancer_probes_client.go -package=mocks -source=load-balancer-probes-client.go diff --git a/sources/azure/clients/load-balancers-client.go b/sources/azure/clients/load-balancers-client.go index 2f3e5df3..a8f11cb3 100644 --- a/sources/azure/clients/load-balancers-client.go +++ b/sources/azure/clients/load-balancers-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_load_balancers_client.go -package=mocks -source=load-balancers-client.go diff --git a/sources/azure/clients/local-network-gateways-client.go b/sources/azure/clients/local-network-gateways-client.go index 03f4bd33..c066e36f 100644 --- a/sources/azure/clients/local-network-gateways-client.go +++ b/sources/azure/clients/local-network-gateways-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_local_network_gateways_client.go -package=mocks -source=local-network-gateways-client.go diff --git a/sources/azure/clients/nat-gateways-client.go b/sources/azure/clients/nat-gateways-client.go index 635f50ed..b07fcbea 100644 --- a/sources/azure/clients/nat-gateways-client.go +++ b/sources/azure/clients/nat-gateways-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_nat_gateways_client.go -package=mocks -source=nat-gateways-client.go diff --git a/sources/azure/clients/network-interfaces-client.go b/sources/azure/clients/network-interfaces-client.go index ad9a50a3..b153d13f 100644 --- a/sources/azure/clients/network-interfaces-client.go +++ b/sources/azure/clients/network-interfaces-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_network_interfaces_client.go -package=mocks -source=network-interfaces-client.go diff --git a/sources/azure/clients/network-private-endpoint-client.go b/sources/azure/clients/network-private-endpoint-client.go index 701eaa83..8cd527e8 100644 --- a/sources/azure/clients/network-private-endpoint-client.go +++ b/sources/azure/clients/network-private-endpoint-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_network_private_endpoint_client.go -package=mocks -source=network-private-endpoint-client.go diff --git a/sources/azure/clients/network-security-groups-client.go b/sources/azure/clients/network-security-groups-client.go index fac29fc0..473b58ac 100644 --- a/sources/azure/clients/network-security-groups-client.go +++ b/sources/azure/clients/network-security-groups-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_network_security_groups_client.go -package=mocks -source=network-security-groups-client.go diff --git a/sources/azure/clients/network-watchers-client.go b/sources/azure/clients/network-watchers-client.go index 582ea58b..4a32c136 100644 --- a/sources/azure/clients/network-watchers-client.go +++ b/sources/azure/clients/network-watchers-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_network_watchers_client.go -package=mocks -source=network-watchers-client.go diff --git a/sources/azure/clients/private-link-services-client.go b/sources/azure/clients/private-link-services-client.go index 1065cf4c..6cc16978 100644 --- a/sources/azure/clients/private-link-services-client.go +++ b/sources/azure/clients/private-link-services-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_private_link_services_client.go -package=mocks -source=private-link-services-client.go diff --git a/sources/azure/clients/public-ip-addresses.go b/sources/azure/clients/public-ip-addresses.go index a43e9b06..68263495 100644 --- a/sources/azure/clients/public-ip-addresses.go +++ b/sources/azure/clients/public-ip-addresses.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_public_ip_addresses_client.go -package=mocks -source=public-ip-addresses.go diff --git a/sources/azure/clients/public-ip-prefixes-client.go b/sources/azure/clients/public-ip-prefixes-client.go index 092639a2..817e284f 100644 --- a/sources/azure/clients/public-ip-prefixes-client.go +++ b/sources/azure/clients/public-ip-prefixes-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_public_ip_prefixes_client.go -package=mocks -source=public-ip-prefixes-client.go diff --git a/sources/azure/clients/route-tables-client.go b/sources/azure/clients/route-tables-client.go index 5686be77..caca7cbe 100644 --- a/sources/azure/clients/route-tables-client.go +++ b/sources/azure/clients/route-tables-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_route_tables_client.go -package=mocks -source=route-tables-client.go diff --git a/sources/azure/clients/routes-client.go b/sources/azure/clients/routes-client.go index 7a23239d..961a52ca 100644 --- a/sources/azure/clients/routes-client.go +++ b/sources/azure/clients/routes-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_routes_client.go -package=mocks -source=routes-client.go diff --git a/sources/azure/clients/security-rules-client.go b/sources/azure/clients/security-rules-client.go index 1a68f0d2..7483738e 100644 --- a/sources/azure/clients/security-rules-client.go +++ b/sources/azure/clients/security-rules-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_security_rules_client.go -package=mocks -source=security-rules-client.go diff --git a/sources/azure/clients/subnets-client.go b/sources/azure/clients/subnets-client.go index 385e83e0..9b8cc158 100644 --- a/sources/azure/clients/subnets-client.go +++ b/sources/azure/clients/subnets-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_subnets_client.go -package=mocks -source=subnets-client.go diff --git a/sources/azure/clients/virtual-network-gateway-connections-client.go b/sources/azure/clients/virtual-network-gateway-connections-client.go index 5dd76653..9172ecae 100644 --- a/sources/azure/clients/virtual-network-gateway-connections-client.go +++ b/sources/azure/clients/virtual-network-gateway-connections-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_virtual_network_gateway_connections_client.go -package=mocks -source=virtual-network-gateway-connections-client.go diff --git a/sources/azure/clients/virtual-network-gateways-client.go b/sources/azure/clients/virtual-network-gateways-client.go index 56401d1b..dbed887c 100644 --- a/sources/azure/clients/virtual-network-gateways-client.go +++ b/sources/azure/clients/virtual-network-gateways-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_virtual_network_gateways_client.go -package=mocks -source=virtual-network-gateways-client.go diff --git a/sources/azure/clients/virtual-network-peerings-client.go b/sources/azure/clients/virtual-network-peerings-client.go index 7bc7029d..b9ff53cd 100644 --- a/sources/azure/clients/virtual-network-peerings-client.go +++ b/sources/azure/clients/virtual-network-peerings-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_virtual_network_peerings_client.go -package=mocks -source=virtual-network-peerings-client.go diff --git a/sources/azure/clients/virtual-networks-client.go b/sources/azure/clients/virtual-networks-client.go index 4b8616f6..bf849d0e 100644 --- a/sources/azure/clients/virtual-networks-client.go +++ b/sources/azure/clients/virtual-networks-client.go @@ -3,7 +3,7 @@ package clients import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" ) //go:generate mockgen -destination=../shared/mocks/mock_virtual_networks_client.go -package=mocks -source=virtual-networks-client.go diff --git a/sources/azure/integration-tests/authorization-role-assignment_test.go b/sources/azure/integration-tests/authorization-role-assignment_test.go index b494d902..7ea8d705 100644 --- a/sources/azure/integration-tests/authorization-role-assignment_test.go +++ b/sources/azure/integration-tests/authorization-role-assignment_test.go @@ -394,8 +394,7 @@ func createRoleAssignmentWithRemediation(ctx context.Context, client *armauthori resp, err := client.Create(ctx, scope, roleAssignmentName, parameters, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusConflict { if strings.Contains(respErr.Error(), "RoleAssignmentExists") { existingID := extractExistingRoleAssignmentID(respErr.Error()) diff --git a/sources/azure/integration-tests/batch-batch-accounts_test.go b/sources/azure/integration-tests/batch-batch-accounts_test.go index a86df3e0..ffbf013d 100644 --- a/sources/azure/integration-tests/batch-batch-accounts_test.go +++ b/sources/azure/integration-tests/batch-batch-accounts_test.go @@ -344,8 +344,7 @@ func createBatchAccount(ctx context.Context, client *armbatch.AccountClient, res }, nil) if err != nil { // Check if batch account already exists (conflict) - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusConflict { log.Printf("Batch account %s already exists (conflict), skipping creation", accountName) return nil diff --git a/sources/azure/integration-tests/batch-private-endpoint-connection_test.go b/sources/azure/integration-tests/batch-private-endpoint-connection_test.go index b6503e77..6bfa09de 100644 --- a/sources/azure/integration-tests/batch-private-endpoint-connection_test.go +++ b/sources/azure/integration-tests/batch-private-endpoint-connection_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch/v4" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage/v4" log "github.com/sirupsen/logrus" @@ -383,8 +383,7 @@ func createBatchAccountWithPrivateEndpointPolicy(ctx context.Context, client *ar }, }, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusConflict { log.Printf("Batch account %s already exists (conflict), skipping creation", accountName) return nil diff --git a/sources/azure/integration-tests/compute-availability-set_test.go b/sources/azure/integration-tests/compute-availability-set_test.go index 6c1c3750..cb92322d 100644 --- a/sources/azure/integration-tests/compute-availability-set_test.go +++ b/sources/azure/integration-tests/compute-availability-set_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/compute-capacity-reservation-group_test.go b/sources/azure/integration-tests/compute-capacity-reservation-group_test.go index 4ff0190f..2e861bae 100644 --- a/sources/azure/integration-tests/compute-capacity-reservation-group_test.go +++ b/sources/azure/integration-tests/compute-capacity-reservation-group_test.go @@ -269,8 +269,7 @@ func createCapacityReservationGroup(ctx context.Context, client *armcompute.Capa func deleteCapacityReservationGroup(ctx context.Context, client *armcompute.CapacityReservationGroupsClient, resourceGroupName, groupName string) error { _, err := client.Delete(ctx, resourceGroupName, groupName, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { switch respErr.StatusCode { case http.StatusNotFound: log.Printf("Capacity reservation group %s not found, skipping deletion", groupName) diff --git a/sources/azure/integration-tests/compute-virtual-machine-extension_test.go b/sources/azure/integration-tests/compute-virtual-machine-extension_test.go index 103b2e3e..b7ad795f 100644 --- a/sources/azure/integration-tests/compute-virtual-machine-extension_test.go +++ b/sources/azure/integration-tests/compute-virtual-machine-extension_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" @@ -731,8 +731,7 @@ func deleteNetworkInterfaceForExtension(ctx context.Context, client *armnetwork. for attempt := 1; attempt <= maxRetries; attempt++ { poller, err := client.BeginDelete(ctx, resourceGroupName, nicName, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusNotFound { log.Printf("Network interface %s not found, skipping deletion", nicName) return nil diff --git a/sources/azure/integration-tests/compute-virtual-machine-run-command_test.go b/sources/azure/integration-tests/compute-virtual-machine-run-command_test.go index e76c752e..ffd72574 100644 --- a/sources/azure/integration-tests/compute-virtual-machine-run-command_test.go +++ b/sources/azure/integration-tests/compute-virtual-machine-run-command_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" @@ -796,8 +796,7 @@ func deleteNetworkInterfaceForRunCommand(ctx context.Context, client *armnetwork for attempt := 1; attempt <= maxRetries; attempt++ { poller, err := client.BeginDelete(ctx, resourceGroupName, nicName, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusNotFound { log.Printf("Network interface %s not found, skipping deletion", nicName) return nil diff --git a/sources/azure/integration-tests/compute-virtual-machine-scale-set_test.go b/sources/azure/integration-tests/compute-virtual-machine-scale-set_test.go index e2ef7eb1..9ddad11d 100644 --- a/sources/azure/integration-tests/compute-virtual-machine-scale-set_test.go +++ b/sources/azure/integration-tests/compute-virtual-machine-scale-set_test.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" @@ -470,8 +470,7 @@ func createVirtualMachineScaleSet(ctx context.Context, client *armcompute.Virtua }, nil) if err != nil { // Check if VMSS already exists (conflict) or quota issue - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusConflict { log.Printf("Virtual machine scale set %s already exists (conflict), verifying it exists", vmssName) // Verify the VMSS actually exists @@ -619,8 +618,7 @@ func waitForVMSSAvailable(ctx context.Context, client *armcompute.VirtualMachine for attempt := 1; attempt <= maxAttempts; attempt++ { resp, err := client.Get(ctx, resourceGroupName, vmssName, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusNotFound { notFoundCount++ // If VMSS doesn't exist, fail after a few attempts diff --git a/sources/azure/integration-tests/compute-virtual-machine_test.go b/sources/azure/integration-tests/compute-virtual-machine_test.go index 483b70b8..5b291057 100644 --- a/sources/azure/integration-tests/compute-virtual-machine_test.go +++ b/sources/azure/integration-tests/compute-virtual-machine_test.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" @@ -596,8 +596,7 @@ func deleteNetworkInterface(ctx context.Context, client *armnetwork.InterfacesCl for attempt := 1; attempt <= maxRetries; attempt++ { poller, err := client.BeginDelete(ctx, resourceGroupName, nicName, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { if respErr.StatusCode == http.StatusNotFound { log.Printf("Network interface %s not found, skipping deletion", nicName) return nil diff --git a/sources/azure/integration-tests/documentdb-database-accounts_test.go b/sources/azure/integration-tests/documentdb-database-accounts_test.go index d41fff0c..9356480d 100644 --- a/sources/azure/integration-tests/documentdb-database-accounts_test.go +++ b/sources/azure/integration-tests/documentdb-database-accounts_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-application-gateway_test.go b/sources/azure/integration-tests/network-application-gateway_test.go index 644b0e76..73d7e4ea 100644 --- a/sources/azure/integration-tests/network-application-gateway_test.go +++ b/sources/azure/integration-tests/network-application-gateway_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-dns-virtual-network-link_test.go b/sources/azure/integration-tests/network-dns-virtual-network-link_test.go index 41ce524f..fe62c220 100644 --- a/sources/azure/integration-tests/network-dns-virtual-network-link_test.go +++ b/sources/azure/integration-tests/network-dns-virtual-network-link_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-flow-log_test.go b/sources/azure/integration-tests/network-flow-log_test.go index fc8b60ea..173dce43 100644 --- a/sources/azure/integration-tests/network-flow-log_test.go +++ b/sources/azure/integration-tests/network-flow-log_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-ip-group_test.go b/sources/azure/integration-tests/network-ip-group_test.go index 1911bcba..d33a478a 100644 --- a/sources/azure/integration-tests/network-ip-group_test.go +++ b/sources/azure/integration-tests/network-ip-group_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-load-balancer-backend-address-pool_test.go b/sources/azure/integration-tests/network-load-balancer-backend-address-pool_test.go index f8ad309c..9c0521ec 100644 --- a/sources/azure/integration-tests/network-load-balancer-backend-address-pool_test.go +++ b/sources/azure/integration-tests/network-load-balancer-backend-address-pool_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-load-balancer-frontend-ip-configuration_test.go b/sources/azure/integration-tests/network-load-balancer-frontend-ip-configuration_test.go index 9e58e3ce..a1fdafa9 100644 --- a/sources/azure/integration-tests/network-load-balancer-frontend-ip-configuration_test.go +++ b/sources/azure/integration-tests/network-load-balancer-frontend-ip-configuration_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-load-balancer-probe_test.go b/sources/azure/integration-tests/network-load-balancer-probe_test.go index b24c7a55..76885298 100644 --- a/sources/azure/integration-tests/network-load-balancer-probe_test.go +++ b/sources/azure/integration-tests/network-load-balancer-probe_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-load-balancer_test.go b/sources/azure/integration-tests/network-load-balancer_test.go index 8ed59b1b..9de4d1b5 100644 --- a/sources/azure/integration-tests/network-load-balancer_test.go +++ b/sources/azure/integration-tests/network-load-balancer_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-local-network-gateway_test.go b/sources/azure/integration-tests/network-local-network-gateway_test.go index 577dd57e..ee0c8213 100644 --- a/sources/azure/integration-tests/network-local-network-gateway_test.go +++ b/sources/azure/integration-tests/network-local-network-gateway_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-network-interface-ip-configuration_test.go b/sources/azure/integration-tests/network-network-interface-ip-configuration_test.go index f88fe84c..8ede9377 100644 --- a/sources/azure/integration-tests/network-network-interface-ip-configuration_test.go +++ b/sources/azure/integration-tests/network-network-interface-ip-configuration_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-network-interface_test.go b/sources/azure/integration-tests/network-network-interface_test.go index 01c979f2..8b3bf318 100644 --- a/sources/azure/integration-tests/network-network-interface_test.go +++ b/sources/azure/integration-tests/network-network-interface_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-network-security-group_test.go b/sources/azure/integration-tests/network-network-security-group_test.go index 277c5415..ad8a9e5a 100644 --- a/sources/azure/integration-tests/network-network-security-group_test.go +++ b/sources/azure/integration-tests/network-network-security-group_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-network-watcher_test.go b/sources/azure/integration-tests/network-network-watcher_test.go index a6c89247..01f84c56 100644 --- a/sources/azure/integration-tests/network-network-watcher_test.go +++ b/sources/azure/integration-tests/network-network-watcher_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-private-link-service_test.go b/sources/azure/integration-tests/network-private-link-service_test.go index cbe53540..f8f24a93 100644 --- a/sources/azure/integration-tests/network-private-link-service_test.go +++ b/sources/azure/integration-tests/network-private-link-service_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-public-ip-address_test.go b/sources/azure/integration-tests/network-public-ip-address_test.go index bd784a25..f432fb08 100644 --- a/sources/azure/integration-tests/network-public-ip-address_test.go +++ b/sources/azure/integration-tests/network-public-ip-address_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-route-table_test.go b/sources/azure/integration-tests/network-route-table_test.go index d955f5c9..999b21bc 100644 --- a/sources/azure/integration-tests/network-route-table_test.go +++ b/sources/azure/integration-tests/network-route-table_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/network-virtual-network-gateway-connection_test.go b/sources/azure/integration-tests/network-virtual-network-gateway-connection_test.go index 74210cc8..6518448d 100644 --- a/sources/azure/integration-tests/network-virtual-network-gateway-connection_test.go +++ b/sources/azure/integration-tests/network-virtual-network-gateway-connection_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/sdk/azcore" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" @@ -81,7 +81,7 @@ func TestNetworkVirtualNetworkGatewayConnectionIntegration(t *testing.T) { var setupCompleted bool t.Run("Setup", func(t *testing.T) { - ctx, cancel := context.WithTimeout(t.Context(), 55*time.Minute) + ctx, cancel := context.WithTimeout(t.Context(), 15*time.Minute) defer cancel() err := createResourceGroup(ctx, rgClient, integrationTestResourceGroup, integrationTestLocation) @@ -119,14 +119,38 @@ func TestNetworkVirtualNetworkGatewayConnectionIntegration(t *testing.T) { t.Fatalf("Failed waiting for local gateway: %v", err) } - err = createVPNGateway(ctx, vpnGatewayClient, subscriptionID, integrationTestResourceGroup, integrationTestVPNGatewayName, integrationTestVPNVNetName, integrationTestVPNSubnetName, integrationTestVPNPublicIPName, integrationTestLocation) - if err != nil { - t.Fatalf("Failed to create VPN gateway: %v", err) - } - - err = waitForVPNGatewayAvailable(ctx, vpnGatewayClient, integrationTestResourceGroup, integrationTestVPNGatewayName) - if err != nil { - t.Fatalf("Failed waiting for VPN gateway: %v", err) + existingGW, err := vpnGatewayClient.Get(ctx, integrationTestResourceGroup, integrationTestVPNGatewayName, nil) + if err == nil { + if existingGW.Properties != nil && existingGW.Properties.ProvisioningState != nil { + state := *existingGW.Properties.ProvisioningState + if state == armnetwork.ProvisioningStateSucceeded { + log.Printf("VPN gateway %s already exists and is ready, skipping creation", integrationTestVPNGatewayName) + } else { + log.Printf("VPN gateway %s exists but in state %s, waiting for it to be ready", integrationTestVPNGatewayName, state) + err = waitForVPNGatewayAvailable(ctx, vpnGatewayClient, integrationTestResourceGroup, integrationTestVPNGatewayName) + if err != nil { + t.Fatalf("Failed waiting for existing VPN gateway to be ready: %v", err) + } + } + } else { + log.Printf("VPN gateway %s already exists, verifying availability", integrationTestVPNGatewayName) + err = waitForVPNGatewayAvailable(ctx, vpnGatewayClient, integrationTestResourceGroup, integrationTestVPNGatewayName) + if err != nil { + t.Fatalf("Failed waiting for VPN gateway to be available: %v", err) + } + } + } else { + var respErr *azcore.ResponseError + if errors.As(err, &respErr) && respErr.StatusCode == http.StatusNotFound { + // VPN gateway creation takes 20-45 minutes, which exceeds the PR CI timeout. + // Full provisioning runs in the weekly azure-integration-tests workflow. + log.Printf("VPN gateway %s does not exist", integrationTestVPNGatewayName) + log.Printf("VPN gateway creation takes 20-45 minutes, which exceeds the PR CI timeout.") + log.Printf("Required resources should be ready: subnet %s and public IP %s", integrationTestVPNSubnetName, integrationTestVPNPublicIPName) + t.Skipf("VPN gateway %s does not exist. Please create it first (takes 20-45 minutes) or ensure it exists in 'Succeeded' state before running integration tests", integrationTestVPNGatewayName) + } else { + t.Fatalf("Failed to check VPN gateway existence: %v", err) + } } err = createVPNConnection(ctx, vpnConnectionsClient, subscriptionID, integrationTestResourceGroup, integrationTestVPNConnectionName, integrationTestVPNGatewayName, integrationTestVPNLocalGWName, integrationTestLocation) @@ -143,6 +167,16 @@ func TestNetworkVirtualNetworkGatewayConnectionIntegration(t *testing.T) { }) t.Run("Run", func(t *testing.T) { + ctx := t.Context() + _, checkErr := vpnConnectionsClient.Get(ctx, integrationTestResourceGroup, integrationTestVPNConnectionName, nil) + if checkErr != nil { + var respErr *azcore.ResponseError + if errors.As(checkErr, &respErr) && respErr.StatusCode == http.StatusNotFound { + t.Skipf("VPN connection %s does not exist (Setup may have been skipped). Skipping Run tests.", integrationTestVPNConnectionName) + } + t.Fatalf("Failed preflight check for VPN connection %s: %v", integrationTestVPNConnectionName, checkErr) + } + if !setupCompleted { t.Skip("Skipping Run: Setup did not complete successfully") } @@ -557,71 +591,6 @@ func waitForVPNLocalGatewayAvailable(ctx context.Context, client *armnetwork.Loc return fmt.Errorf("timeout waiting for local network gateway %s", gatewayName) } -func createVPNGateway(ctx context.Context, client *armnetwork.VirtualNetworkGatewaysClient, subscriptionID, resourceGroupName, gatewayName, vnetName, subnetName, pipName, location string) error { - existingGW, err := client.Get(ctx, resourceGroupName, gatewayName, nil) - if err == nil && existingGW.Properties != nil { - log.Printf("VPN gateway %s already exists, skipping creation", gatewayName) - return nil - } - - subnetID := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworks/%s/subnets/%s", - subscriptionID, resourceGroupName, vnetName, subnetName) - pipID := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/publicIPAddresses/%s", - subscriptionID, resourceGroupName, pipName) - - gatewayTypeVPN := armnetwork.VirtualNetworkGatewayTypeVPN - vpnTypeRouteBased := armnetwork.VPNTypeRouteBased - skuNameVPNGw1AZ := armnetwork.VirtualNetworkGatewaySKUNameVPNGw1AZ - skuTierVPNGw1AZ := armnetwork.VirtualNetworkGatewaySKUTierVPNGw1AZ - allocMethodDynamic := armnetwork.IPAllocationMethodDynamic - poller, err := client.BeginCreateOrUpdate(ctx, resourceGroupName, gatewayName, armnetwork.VirtualNetworkGateway{ - Location: &location, - Properties: &armnetwork.VirtualNetworkGatewayPropertiesFormat{ - GatewayType: &gatewayTypeVPN, - VPNType: &vpnTypeRouteBased, - SKU: &armnetwork.VirtualNetworkGatewaySKU{ - Name: &skuNameVPNGw1AZ, - Tier: &skuTierVPNGw1AZ, - }, - IPConfigurations: []*armnetwork.VirtualNetworkGatewayIPConfiguration{ - { - Name: new("default"), - Properties: &armnetwork.VirtualNetworkGatewayIPConfigurationPropertiesFormat{ - PrivateIPAllocationMethod: &allocMethodDynamic, - Subnet: &armnetwork.SubResource{ - ID: &subnetID, - }, - PublicIPAddress: &armnetwork.SubResource{ - ID: &pipID, - }, - }, - }, - }, - }, - Tags: map[string]*string{ - "purpose": new("overmind-integration-tests"), - "test": new("network-virtual-network-gateway-connection"), - }, - }, nil) - if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) && respErr.StatusCode == http.StatusConflict { - log.Printf("VPN gateway %s already exists (conflict), skipping creation", gatewayName) - return nil - } - return fmt.Errorf("failed to begin creating VPN gateway: %w", err) - } - - log.Printf("VPN gateway %s creation started, this may take 20-45 minutes...", gatewayName) - _, err = poller.PollUntilDone(ctx, nil) - if err != nil { - return fmt.Errorf("failed to create VPN gateway: %w", err) - } - - log.Printf("VPN gateway %s created successfully", gatewayName) - return nil -} - func waitForVPNGatewayAvailable(ctx context.Context, client *armnetwork.VirtualNetworkGatewaysClient, resourceGroupName, gatewayName string) error { maxAttempts := 60 pollInterval := 30 * time.Second diff --git a/sources/azure/integration-tests/network-virtual-network_test.go b/sources/azure/integration-tests/network-virtual-network_test.go index f5ec2352..0ebbf783 100644 --- a/sources/azure/integration-tests/network-virtual-network_test.go +++ b/sources/azure/integration-tests/network-virtual-network_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v4" log "github.com/sirupsen/logrus" diff --git a/sources/azure/integration-tests/operational-insights-workspace_test.go b/sources/azure/integration-tests/operational-insights-workspace_test.go index 425df9ba..ee4ef515 100644 --- a/sources/azure/integration-tests/operational-insights-workspace_test.go +++ b/sources/azure/integration-tests/operational-insights-workspace_test.go @@ -307,8 +307,7 @@ func createOperationalInsightsWorkspace(ctx context.Context, client *armoperatio }, }, nil) if err != nil { - var respErr *azcore.ResponseError - if errors.As(err, &respErr) { + if respErr, ok := errors.AsType[*azcore.ResponseError](err); ok { // Check for authorization failure (resource provider not registered) if respErr.StatusCode == http.StatusForbidden && respErr.ErrorCode == "AuthorizationFailed" { return fmt.Errorf("%w: %s", errOperationalInsightsAuthorizationFailed, respErr.Error()) diff --git a/sources/azure/manual/adapters.go b/sources/azure/manual/adapters.go index 361aa900..b6d86d0d 100644 --- a/sources/azure/manual/adapters.go +++ b/sources/azure/manual/adapters.go @@ -8,13 +8,13 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v3" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/batch/armbatch/v4" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v8" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/elasticsan/armelasticsan" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault/v2" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/maintenance/armmaintenance" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/operationalinsights/armoperationalinsights/v3" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/postgresql/armpostgresqlflexibleservers/v5" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns/v2" diff --git a/sources/azure/manual/authorization-role-assignment_test.go b/sources/azure/manual/authorization-role-assignment_test.go index 141ded9f..9ef2b512 100644 --- a/sources/azure/manual/authorization-role-assignment_test.go +++ b/sources/azure/manual/authorization-role-assignment_test.go @@ -175,9 +175,7 @@ func TestAuthorizationRoleAssignment(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armauthorization.RoleAssignmentsClientListForResourceGroupResponse{ - RoleAssignmentListResult: armauthorization.RoleAssignmentListResult{ - Value: []*armauthorization.RoleAssignment{roleAssignment1, roleAssignment2}, - }, + Value: []*armauthorization.RoleAssignment{roleAssignment1, roleAssignment2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -283,9 +281,7 @@ func TestAuthorizationRoleAssignment(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armauthorization.RoleAssignmentsClientListForResourceGroupResponse{ - RoleAssignmentListResult: armauthorization.RoleAssignmentListResult{ - Value: []*armauthorization.RoleAssignment{roleAssignment1, roleAssignment2}, - }, + Value: []*armauthorization.RoleAssignment{roleAssignment1, roleAssignment2}, }, nil), ) diff --git a/sources/azure/manual/authorization-role-definition_test.go b/sources/azure/manual/authorization-role-definition_test.go index 93cfa318..5f53d58f 100644 --- a/sources/azure/manual/authorization-role-definition_test.go +++ b/sources/azure/manual/authorization-role-definition_test.go @@ -160,9 +160,7 @@ func TestAuthorizationRoleDefinition(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armauthorization.RoleDefinitionsClientListResponse{ - RoleDefinitionListResult: armauthorization.RoleDefinitionListResult{ - Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, - }, + Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -259,9 +257,7 @@ func TestAuthorizationRoleDefinition(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armauthorization.RoleDefinitionsClientListResponse{ - RoleDefinitionListResult: armauthorization.RoleDefinitionListResult{ - Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, - }, + Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -298,9 +294,7 @@ func TestAuthorizationRoleDefinition(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armauthorization.RoleDefinitionsClientListResponse{ - RoleDefinitionListResult: armauthorization.RoleDefinitionListResult{ - Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, - }, + Value: []*armauthorization.RoleDefinition{roleDefinition1, roleDefinition2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/batch-batch-application-package_test.go b/sources/azure/manual/batch-batch-application-package_test.go index 3fe15b71..7fae6ae5 100644 --- a/sources/azure/manual/batch-batch-application-package_test.go +++ b/sources/azure/manual/batch-batch-application-package_test.go @@ -176,9 +176,7 @@ func TestBatchBatchApplicationPackage(t *testing.T) { mockClient := mocks.NewMockBatchApplicationPackagesClient(ctrl) pages := []armbatch.ApplicationPackageClientListResponse{ { - ListApplicationPackagesResult: armbatch.ListApplicationPackagesResult{ - Value: []*armbatch.ApplicationPackage{pkg1, pkg2}, - }, + Value: []*armbatch.ApplicationPackage{pkg1, pkg2}, }, } mockPager := &mockBatchApplicationPackagesPager{pages: pages} @@ -218,9 +216,7 @@ func TestBatchBatchApplicationPackage(t *testing.T) { mockClient := mocks.NewMockBatchApplicationPackagesClient(ctrl) pages := []armbatch.ApplicationPackageClientListResponse{ { - ListApplicationPackagesResult: armbatch.ListApplicationPackagesResult{ - Value: []*armbatch.ApplicationPackage{pkg1, pkg2}, - }, + Value: []*armbatch.ApplicationPackage{pkg1, pkg2}, }, } mockPager := &mockBatchApplicationPackagesPager{pages: pages} @@ -290,9 +286,7 @@ func TestBatchBatchApplicationPackage(t *testing.T) { mockClient := mocks.NewMockBatchApplicationPackagesClient(ctrl) pages := []armbatch.ApplicationPackageClientListResponse{ { - ListApplicationPackagesResult: armbatch.ListApplicationPackagesResult{ - Value: []*armbatch.ApplicationPackage{nilNamePkg, validPkg}, - }, + Value: []*armbatch.ApplicationPackage{nilNamePkg, validPkg}, }, } mockPager := &mockBatchApplicationPackagesPager{pages: pages} diff --git a/sources/azure/manual/batch-batch-application_test.go b/sources/azure/manual/batch-batch-application_test.go index 8a0ce298..8fb263be 100644 --- a/sources/azure/manual/batch-batch-application_test.go +++ b/sources/azure/manual/batch-batch-application_test.go @@ -169,9 +169,7 @@ func TestBatchBatchApplication(t *testing.T) { mockClient := mocks.NewMockBatchApplicationsClient(ctrl) pages := []armbatch.ApplicationClientListResponse{ { - ListApplicationsResult: armbatch.ListApplicationsResult{ - Value: []*armbatch.Application{app1, app2}, - }, + Value: []*armbatch.Application{app1, app2}, }, } mockPager := &mockBatchApplicationsPager{pages: pages} diff --git a/sources/azure/manual/batch-batch-pool_test.go b/sources/azure/manual/batch-batch-pool_test.go index 9a9a5592..9fd638e3 100644 --- a/sources/azure/manual/batch-batch-pool_test.go +++ b/sources/azure/manual/batch-batch-pool_test.go @@ -166,9 +166,7 @@ func TestBatchBatchPool(t *testing.T) { mockClient := mocks.NewMockBatchPoolsClient(ctrl) pages := []armbatch.PoolClientListByBatchAccountResponse{ { - ListPoolsResult: armbatch.ListPoolsResult{ - Value: []*armbatch.Pool{pool1, pool2}, - }, + Value: []*armbatch.Pool{pool1, pool2}, }, } mockPager := &mockBatchPoolsPager{pages: pages} diff --git a/sources/azure/manual/batch-private-endpoint-connection_test.go b/sources/azure/manual/batch-private-endpoint-connection_test.go index aaba0ec8..ca6c2649 100644 --- a/sources/azure/manual/batch-private-endpoint-connection_test.go +++ b/sources/azure/manual/batch-private-endpoint-connection_test.go @@ -203,9 +203,7 @@ func TestBatchPrivateEndpointConnection(t *testing.T) { mockPager := &mockBatchPrivateEndpointConnectionPager{ pages: []armbatch.PrivateEndpointConnectionClientListByBatchAccountResponse{ { - ListPrivateEndpointConnectionsResult: armbatch.ListPrivateEndpointConnectionsResult{ - Value: []*armbatch.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armbatch.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -250,9 +248,7 @@ func TestBatchPrivateEndpointConnection(t *testing.T) { mockPager := &mockBatchPrivateEndpointConnectionPager{ pages: []armbatch.PrivateEndpointConnectionClientListByBatchAccountResponse{ { - ListPrivateEndpointConnectionsResult: armbatch.ListPrivateEndpointConnectionsResult{ - Value: []*armbatch.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armbatch.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -300,11 +296,9 @@ func TestBatchPrivateEndpointConnection(t *testing.T) { mockPager := &mockBatchPrivateEndpointConnectionPager{ pages: []armbatch.PrivateEndpointConnectionClientListByBatchAccountResponse{ { - ListPrivateEndpointConnectionsResult: armbatch.ListPrivateEndpointConnectionsResult{ - Value: []*armbatch.PrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armbatch.PrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/compute-availability-set_test.go b/sources/azure/manual/compute-availability-set_test.go index ed4e28a6..e067955a 100644 --- a/sources/azure/manual/compute-availability-set_test.go +++ b/sources/azure/manual/compute-availability-set_test.go @@ -414,9 +414,7 @@ func (m *mockAvailabilitySetsPager) NextPage(ctx context.Context) (armcompute.Av if m.index >= len(m.items) { m.more = false return armcompute.AvailabilitySetsClientListResponse{ - AvailabilitySetListResult: armcompute.AvailabilitySetListResult{ - Value: []*armcompute.AvailabilitySet{}, - }, + Value: []*armcompute.AvailabilitySet{}, }, nil } @@ -425,8 +423,6 @@ func (m *mockAvailabilitySetsPager) NextPage(ctx context.Context) (armcompute.Av m.more = m.index < len(m.items) return armcompute.AvailabilitySetsClientListResponse{ - AvailabilitySetListResult: armcompute.AvailabilitySetListResult{ - Value: []*armcompute.AvailabilitySet{item}, - }, + Value: []*armcompute.AvailabilitySet{item}, }, nil } diff --git a/sources/azure/manual/compute-capacity-reservation-group_test.go b/sources/azure/manual/compute-capacity-reservation-group_test.go index 618cb2cd..18eef33a 100644 --- a/sources/azure/manual/compute-capacity-reservation-group_test.go +++ b/sources/azure/manual/compute-capacity-reservation-group_test.go @@ -390,9 +390,7 @@ func (m *mockCapacityReservationGroupsPager) NextPage(ctx context.Context) (armc if m.index >= len(m.items) { m.more = false return armcompute.CapacityReservationGroupsClientListByResourceGroupResponse{ - CapacityReservationGroupListResult: armcompute.CapacityReservationGroupListResult{ - Value: []*armcompute.CapacityReservationGroup{}, - }, + Value: []*armcompute.CapacityReservationGroup{}, }, nil } @@ -401,9 +399,7 @@ func (m *mockCapacityReservationGroupsPager) NextPage(ctx context.Context) (armc m.more = m.index < len(m.items) return armcompute.CapacityReservationGroupsClientListByResourceGroupResponse{ - CapacityReservationGroupListResult: armcompute.CapacityReservationGroupListResult{ - Value: []*armcompute.CapacityReservationGroup{item}, - }, + Value: []*armcompute.CapacityReservationGroup{item}, }, nil } diff --git a/sources/azure/manual/compute-capacity-reservation_test.go b/sources/azure/manual/compute-capacity-reservation_test.go index 642578ee..03448e28 100644 --- a/sources/azure/manual/compute-capacity-reservation_test.go +++ b/sources/azure/manual/compute-capacity-reservation_test.go @@ -71,17 +71,13 @@ func (m *mockCapacityReservationsPager) More() bool { func (m *mockCapacityReservationsPager) NextPage(ctx context.Context) (armcompute.CapacityReservationsClientListByCapacityReservationGroupResponse, error) { if m.index >= len(m.items) { return armcompute.CapacityReservationsClientListByCapacityReservationGroupResponse{ - CapacityReservationListResult: armcompute.CapacityReservationListResult{ - Value: []*armcompute.CapacityReservation{}, - }, + Value: []*armcompute.CapacityReservation{}, }, nil } item := m.items[m.index] m.index++ return armcompute.CapacityReservationsClientListByCapacityReservationGroupResponse{ - CapacityReservationListResult: armcompute.CapacityReservationListResult{ - Value: []*armcompute.CapacityReservation{item}, - }, + Value: []*armcompute.CapacityReservation{item}, }, nil } diff --git a/sources/azure/manual/compute-dedicated-host-group_test.go b/sources/azure/manual/compute-dedicated-host-group_test.go index f38e0b60..fa0ddb0c 100644 --- a/sources/azure/manual/compute-dedicated-host-group_test.go +++ b/sources/azure/manual/compute-dedicated-host-group_test.go @@ -368,9 +368,7 @@ func (m *mockDedicatedHostGroupsPager) NextPage(ctx context.Context) (armcompute if m.index >= len(m.items) { m.more = false return armcompute.DedicatedHostGroupsClientListByResourceGroupResponse{ - DedicatedHostGroupListResult: armcompute.DedicatedHostGroupListResult{ - Value: []*armcompute.DedicatedHostGroup{}, - }, + Value: []*armcompute.DedicatedHostGroup{}, }, nil } @@ -379,9 +377,7 @@ func (m *mockDedicatedHostGroupsPager) NextPage(ctx context.Context) (armcompute m.more = m.index < len(m.items) return armcompute.DedicatedHostGroupsClientListByResourceGroupResponse{ - DedicatedHostGroupListResult: armcompute.DedicatedHostGroupListResult{ - Value: []*armcompute.DedicatedHostGroup{item}, - }, + Value: []*armcompute.DedicatedHostGroup{item}, }, nil } diff --git a/sources/azure/manual/compute-dedicated-host_test.go b/sources/azure/manual/compute-dedicated-host_test.go index c2243632..0e40103e 100644 --- a/sources/azure/manual/compute-dedicated-host_test.go +++ b/sources/azure/manual/compute-dedicated-host_test.go @@ -71,17 +71,13 @@ func (m *mockDedicatedHostsPager) More() bool { func (m *mockDedicatedHostsPager) NextPage(ctx context.Context) (armcompute.DedicatedHostsClientListByHostGroupResponse, error) { if m.index >= len(m.items) { return armcompute.DedicatedHostsClientListByHostGroupResponse{ - DedicatedHostListResult: armcompute.DedicatedHostListResult{ - Value: []*armcompute.DedicatedHost{}, - }, + Value: []*armcompute.DedicatedHost{}, }, nil } item := m.items[m.index] m.index++ return armcompute.DedicatedHostsClientListByHostGroupResponse{ - DedicatedHostListResult: armcompute.DedicatedHostListResult{ - Value: []*armcompute.DedicatedHost{item}, - }, + Value: []*armcompute.DedicatedHost{item}, }, nil } diff --git a/sources/azure/manual/compute-disk-access-private-endpoint-connection_test.go b/sources/azure/manual/compute-disk-access-private-endpoint-connection_test.go index 87ad2569..2555892e 100644 --- a/sources/azure/manual/compute-disk-access-private-endpoint-connection_test.go +++ b/sources/azure/manual/compute-disk-access-private-endpoint-connection_test.go @@ -175,9 +175,7 @@ func TestComputeDiskAccessPrivateEndpointConnection(t *testing.T) { mockPager := &mockComputeDiskAccessPrivateEndpointConnectionsPager{ pages: []armcompute.DiskAccessesClientListPrivateEndpointConnectionsResponse{ { - PrivateEndpointConnectionListResult: armcompute.PrivateEndpointConnectionListResult{ - Value: []*armcompute.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armcompute.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -221,11 +219,9 @@ func TestComputeDiskAccessPrivateEndpointConnection(t *testing.T) { mockPager := &mockComputeDiskAccessPrivateEndpointConnectionsPager{ pages: []armcompute.DiskAccessesClientListPrivateEndpointConnectionsResponse{ { - PrivateEndpointConnectionListResult: armcompute.PrivateEndpointConnectionListResult{ - Value: []*armcompute.PrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armcompute.PrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/compute-disk-access_test.go b/sources/azure/manual/compute-disk-access_test.go index 9a2986c2..63b88eec 100644 --- a/sources/azure/manual/compute-disk-access_test.go +++ b/sources/azure/manual/compute-disk-access_test.go @@ -387,9 +387,7 @@ func (m *mockDiskAccessesPager) NextPage(ctx context.Context) (armcompute.DiskAc if m.index >= len(m.items) { m.more = false return armcompute.DiskAccessesClientListByResourceGroupResponse{ - DiskAccessList: armcompute.DiskAccessList{ - Value: []*armcompute.DiskAccess{}, - }, + Value: []*armcompute.DiskAccess{}, }, nil } @@ -398,9 +396,7 @@ func (m *mockDiskAccessesPager) NextPage(ctx context.Context) (armcompute.DiskAc m.more = m.index < len(m.items) return armcompute.DiskAccessesClientListByResourceGroupResponse{ - DiskAccessList: armcompute.DiskAccessList{ - Value: []*armcompute.DiskAccess{item}, - }, + Value: []*armcompute.DiskAccess{item}, }, nil } diff --git a/sources/azure/manual/compute-disk-encryption-set_test.go b/sources/azure/manual/compute-disk-encryption-set_test.go index 52498cee..cdba9f4c 100644 --- a/sources/azure/manual/compute-disk-encryption-set_test.go +++ b/sources/azure/manual/compute-disk-encryption-set_test.go @@ -515,7 +515,7 @@ func (m *mockDiskEncryptionSetsPager) NextPage(ctx context.Context) (armcompute. if m.index >= len(m.items) { m.more = false return armcompute.DiskEncryptionSetsClientListByResourceGroupResponse{ - DiskEncryptionSetList: armcompute.DiskEncryptionSetList{Value: []*armcompute.DiskEncryptionSet{}}, + Value: []*armcompute.DiskEncryptionSet{}, }, nil } @@ -524,7 +524,7 @@ func (m *mockDiskEncryptionSetsPager) NextPage(ctx context.Context) (armcompute. m.more = m.index < len(m.items) return armcompute.DiskEncryptionSetsClientListByResourceGroupResponse{ - DiskEncryptionSetList: armcompute.DiskEncryptionSetList{Value: []*armcompute.DiskEncryptionSet{item}}, + Value: []*armcompute.DiskEncryptionSet{item}, }, nil } diff --git a/sources/azure/manual/compute-disk_test.go b/sources/azure/manual/compute-disk_test.go index 8ffbd492..28ed88bb 100644 --- a/sources/azure/manual/compute-disk_test.go +++ b/sources/azure/manual/compute-disk_test.go @@ -632,9 +632,7 @@ func (m *mockDisksPager) NextPage(ctx context.Context) (armcompute.DisksClientLi if m.index >= len(m.items) { m.more = false return armcompute.DisksClientListByResourceGroupResponse{ - DiskList: armcompute.DiskList{ - Value: []*armcompute.Disk{}, - }, + Value: []*armcompute.Disk{}, }, nil } @@ -643,9 +641,7 @@ func (m *mockDisksPager) NextPage(ctx context.Context) (armcompute.DisksClientLi m.more = m.index < len(m.items) return armcompute.DisksClientListByResourceGroupResponse{ - DiskList: armcompute.DiskList{ - Value: []*armcompute.Disk{item}, - }, + Value: []*armcompute.Disk{item}, }, nil } diff --git a/sources/azure/manual/compute-gallery-application-version_test.go b/sources/azure/manual/compute-gallery-application-version_test.go index 1b818cc5..653cf878 100644 --- a/sources/azure/manual/compute-gallery-application-version_test.go +++ b/sources/azure/manual/compute-gallery-application-version_test.go @@ -332,9 +332,7 @@ func TestComputeGalleryApplicationVersion(t *testing.T) { mockClient := mocks.NewMockGalleryApplicationVersionsClient(ctrl) pages := []armcompute.GalleryApplicationVersionsClientListByGalleryApplicationResponse{ { - GalleryApplicationVersionList: armcompute.GalleryApplicationVersionList{ - Value: []*armcompute.GalleryApplicationVersion{v1, v2}, - }, + Value: []*armcompute.GalleryApplicationVersion{v1, v2}, }, } mockPager := &mockGalleryApplicationVersionsPager{pages: pages} diff --git a/sources/azure/manual/compute-gallery-application_test.go b/sources/azure/manual/compute-gallery-application_test.go index c65915b7..a67883d8 100644 --- a/sources/azure/manual/compute-gallery-application_test.go +++ b/sources/azure/manual/compute-gallery-application_test.go @@ -190,9 +190,7 @@ func TestComputeGalleryApplication(t *testing.T) { mockClient := mocks.NewMockGalleryApplicationsClient(ctrl) pages := []armcompute.GalleryApplicationsClientListByGalleryResponse{ { - GalleryApplicationList: armcompute.GalleryApplicationList{ - Value: []*armcompute.GalleryApplication{app1, app2}, - }, + Value: []*armcompute.GalleryApplication{app1, app2}, }, } mockPager := &mockGalleryApplicationsPager{pages: pages} diff --git a/sources/azure/manual/compute-gallery-image_test.go b/sources/azure/manual/compute-gallery-image_test.go index b421ee15..1380883e 100644 --- a/sources/azure/manual/compute-gallery-image_test.go +++ b/sources/azure/manual/compute-gallery-image_test.go @@ -350,9 +350,7 @@ func TestComputeGalleryImage(t *testing.T) { mockClient := mocks.NewMockGalleryImagesClient(ctrl) pages := []armcompute.GalleryImagesClientListByGalleryResponse{ { - GalleryImageList: armcompute.GalleryImageList{ - Value: []*armcompute.GalleryImage{img1, img2}, - }, + Value: []*armcompute.GalleryImage{img1, img2}, }, } mockPager := &mockGalleryImagesPager{pages: pages} diff --git a/sources/azure/manual/compute-gallery_test.go b/sources/azure/manual/compute-gallery_test.go index 2590021c..c83afae8 100644 --- a/sources/azure/manual/compute-gallery_test.go +++ b/sources/azure/manual/compute-gallery_test.go @@ -274,9 +274,7 @@ func (m *mockGalleriesPager) NextPage(ctx context.Context) (armcompute.Galleries if m.index >= len(m.items) { m.more = false return armcompute.GalleriesClientListByResourceGroupResponse{ - GalleryList: armcompute.GalleryList{ - Value: []*armcompute.Gallery{}, - }, + Value: []*armcompute.Gallery{}, }, nil } @@ -285,8 +283,6 @@ func (m *mockGalleriesPager) NextPage(ctx context.Context) (armcompute.Galleries m.more = m.index < len(m.items) return armcompute.GalleriesClientListByResourceGroupResponse{ - GalleryList: armcompute.GalleryList{ - Value: []*armcompute.Gallery{item}, - }, + Value: []*armcompute.Gallery{item}, }, nil } diff --git a/sources/azure/manual/compute-image_test.go b/sources/azure/manual/compute-image_test.go index c1af3275..f3e5af81 100644 --- a/sources/azure/manual/compute-image_test.go +++ b/sources/azure/manual/compute-image_test.go @@ -606,9 +606,7 @@ func (m *mockImagesPager) NextPage(ctx context.Context) (armcompute.ImagesClient if m.index >= len(m.items) { m.more = false return armcompute.ImagesClientListByResourceGroupResponse{ - ImageListResult: armcompute.ImageListResult{ - Value: []*armcompute.Image{}, - }, + Value: []*armcompute.Image{}, }, nil } @@ -617,9 +615,7 @@ func (m *mockImagesPager) NextPage(ctx context.Context) (armcompute.ImagesClient m.more = m.index < len(m.items) return armcompute.ImagesClientListByResourceGroupResponse{ - ImageListResult: armcompute.ImageListResult{ - Value: []*armcompute.Image{item}, - }, + Value: []*armcompute.Image{item}, }, nil } diff --git a/sources/azure/manual/compute-proximity-placement-group_test.go b/sources/azure/manual/compute-proximity-placement-group_test.go index 3e0a3eaf..b9930a98 100644 --- a/sources/azure/manual/compute-proximity-placement-group_test.go +++ b/sources/azure/manual/compute-proximity-placement-group_test.go @@ -338,9 +338,7 @@ func (m *mockProximityPlacementGroupsPager) NextPage(ctx context.Context) (armco if m.index >= len(m.items) { m.more = false return armcompute.ProximityPlacementGroupsClientListByResourceGroupResponse{ - ProximityPlacementGroupListResult: armcompute.ProximityPlacementGroupListResult{ - Value: []*armcompute.ProximityPlacementGroup{}, - }, + Value: []*armcompute.ProximityPlacementGroup{}, }, nil } @@ -349,8 +347,6 @@ func (m *mockProximityPlacementGroupsPager) NextPage(ctx context.Context) (armco m.more = m.index < len(m.items) return armcompute.ProximityPlacementGroupsClientListByResourceGroupResponse{ - ProximityPlacementGroupListResult: armcompute.ProximityPlacementGroupListResult{ - Value: []*armcompute.ProximityPlacementGroup{item}, - }, + Value: []*armcompute.ProximityPlacementGroup{item}, }, nil } diff --git a/sources/azure/manual/compute-shared-gallery-image_test.go b/sources/azure/manual/compute-shared-gallery-image_test.go index f10215bc..62fe5b5f 100644 --- a/sources/azure/manual/compute-shared-gallery-image_test.go +++ b/sources/azure/manual/compute-shared-gallery-image_test.go @@ -430,9 +430,7 @@ func newMockSharedGalleryImagesPager(items []*armcompute.SharedGalleryImage) cli return &mockSharedGalleryImagesPager{ pages: []armcompute.SharedGalleryImagesClientListResponse{ { - SharedGalleryImageList: armcompute.SharedGalleryImageList{ - Value: items, - }, + Value: items, }, }, index: 0, diff --git a/sources/azure/manual/compute-snapshot_test.go b/sources/azure/manual/compute-snapshot_test.go index bd7c312d..9daf393b 100644 --- a/sources/azure/manual/compute-snapshot_test.go +++ b/sources/azure/manual/compute-snapshot_test.go @@ -680,9 +680,7 @@ func (m *mockSnapshotsPager) NextPage(ctx context.Context) (armcompute.Snapshots if m.index >= len(m.items) { m.more = false return armcompute.SnapshotsClientListByResourceGroupResponse{ - SnapshotList: armcompute.SnapshotList{ - Value: []*armcompute.Snapshot{}, - }, + Value: []*armcompute.Snapshot{}, }, nil } @@ -691,8 +689,6 @@ func (m *mockSnapshotsPager) NextPage(ctx context.Context) (armcompute.Snapshots m.more = m.index < len(m.items) return armcompute.SnapshotsClientListByResourceGroupResponse{ - SnapshotList: armcompute.SnapshotList{ - Value: []*armcompute.Snapshot{item}, - }, + Value: []*armcompute.Snapshot{item}, }, nil } diff --git a/sources/azure/manual/compute-virtual-machine-extension_test.go b/sources/azure/manual/compute-virtual-machine-extension_test.go index 10b4efa4..54829806 100644 --- a/sources/azure/manual/compute-virtual-machine-extension_test.go +++ b/sources/azure/manual/compute-virtual-machine-extension_test.go @@ -448,11 +448,9 @@ func TestComputeVirtualMachineExtension(t *testing.T) { mockClient := mocks.NewMockVirtualMachineExtensionsClient(ctrl) mockClient.EXPECT().List(ctx, resourceGroup, vmName, nil).Return( armcompute.VirtualMachineExtensionsClientListResponse{ - VirtualMachineExtensionsListResult: armcompute.VirtualMachineExtensionsListResult{ - Value: []*armcompute.VirtualMachineExtension{ - extension1, - extension2, - }, + Value: []*armcompute.VirtualMachineExtension{ + extension1, + extension2, }, }, nil) @@ -537,10 +535,8 @@ func TestComputeVirtualMachineExtension(t *testing.T) { mockClient := mocks.NewMockVirtualMachineExtensionsClient(ctrl) mockClient.EXPECT().List(ctx, resourceGroup, vmName, nil).Return( armcompute.VirtualMachineExtensionsClientListResponse{ - VirtualMachineExtensionsListResult: armcompute.VirtualMachineExtensionsListResult{ - Value: []*armcompute.VirtualMachineExtension{ - extension, - }, + Value: []*armcompute.VirtualMachineExtension{ + extension, }, }, nil) diff --git a/sources/azure/manual/compute-virtual-machine-run-command_test.go b/sources/azure/manual/compute-virtual-machine-run-command_test.go index b89a5470..8ba78104 100644 --- a/sources/azure/manual/compute-virtual-machine-run-command_test.go +++ b/sources/azure/manual/compute-virtual-machine-run-command_test.go @@ -401,9 +401,7 @@ func TestComputeVirtualMachineRunCommand(t *testing.T) { mockPager := &mockVirtualMachineRunCommandsPager{ pages: []armcompute.VirtualMachineRunCommandsClientListByVirtualMachineResponse{ { - VirtualMachineRunCommandsListResult: armcompute.VirtualMachineRunCommandsListResult{ - Value: []*armcompute.VirtualMachineRunCommand{runCommand1, runCommand2}, - }, + Value: []*armcompute.VirtualMachineRunCommand{runCommand1, runCommand2}, }, }, index: 0, @@ -512,9 +510,7 @@ func TestComputeVirtualMachineRunCommand(t *testing.T) { mockPager := &mockVirtualMachineRunCommandsPager{ pages: []armcompute.VirtualMachineRunCommandsClientListByVirtualMachineResponse{ { - VirtualMachineRunCommandsListResult: armcompute.VirtualMachineRunCommandsListResult{ - Value: []*armcompute.VirtualMachineRunCommand{runCommandWithName, runCommandWithoutName}, - }, + Value: []*armcompute.VirtualMachineRunCommand{runCommandWithName, runCommandWithoutName}, }, }, index: 0, diff --git a/sources/azure/manual/compute-virtual-machine-scale-set_test.go b/sources/azure/manual/compute-virtual-machine-scale-set_test.go index a55b75e6..310798ac 100644 --- a/sources/azure/manual/compute-virtual-machine-scale-set_test.go +++ b/sources/azure/manual/compute-virtual-machine-scale-set_test.go @@ -328,9 +328,7 @@ func TestComputeVirtualMachineScaleSet(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armcompute.VirtualMachineScaleSetsClientListResponse{ - VirtualMachineScaleSetListResult: armcompute.VirtualMachineScaleSetListResult{ - Value: []*armcompute.VirtualMachineScaleSet{scaleSet1, scaleSet2}, - }, + Value: []*armcompute.VirtualMachineScaleSet{scaleSet1, scaleSet2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -377,9 +375,7 @@ func TestComputeVirtualMachineScaleSet(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armcompute.VirtualMachineScaleSetsClientListResponse{ - VirtualMachineScaleSetListResult: armcompute.VirtualMachineScaleSetListResult{ - Value: []*armcompute.VirtualMachineScaleSet{scaleSet1, scaleSet2}, - }, + Value: []*armcompute.VirtualMachineScaleSet{scaleSet1, scaleSet2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/compute-virtual-machine_test.go b/sources/azure/manual/compute-virtual-machine_test.go index ab3be900..e82c78b8 100644 --- a/sources/azure/manual/compute-virtual-machine_test.go +++ b/sources/azure/manual/compute-virtual-machine_test.go @@ -193,9 +193,7 @@ func TestComputeVirtualMachine(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armcompute.VirtualMachinesClientListResponse{ - VirtualMachineListResult: armcompute.VirtualMachineListResult{ - Value: []*armcompute.VirtualMachine{vm1, vm2}, - }, + Value: []*armcompute.VirtualMachine{vm1, vm2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -242,9 +240,7 @@ func TestComputeVirtualMachine(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armcompute.VirtualMachinesClientListResponse{ - VirtualMachineListResult: armcompute.VirtualMachineListResult{ - Value: []*armcompute.VirtualMachine{vm1, vm2}, - }, + Value: []*armcompute.VirtualMachine{vm1, vm2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/dbforpostgresql-database_test.go b/sources/azure/manual/dbforpostgresql-database_test.go index fdc59aa8..0b9896a2 100644 --- a/sources/azure/manual/dbforpostgresql-database_test.go +++ b/sources/azure/manual/dbforpostgresql-database_test.go @@ -148,9 +148,7 @@ func TestDBforPostgreSQLDatabase(t *testing.T) { mockPager := &mockPostgreSQLDatabasesPager{ pages: []armpostgresqlflexibleservers.DatabasesClientListByServerResponse{ { - DatabaseList: armpostgresqlflexibleservers.DatabaseList{ - Value: []*armpostgresqlflexibleservers.Database{database1, database2}, - }, + Value: []*armpostgresqlflexibleservers.Database{database1, database2}, }, }, } @@ -202,9 +200,7 @@ func TestDBforPostgreSQLDatabase(t *testing.T) { mockPager := &mockPostgreSQLDatabasesPager{ pages: []armpostgresqlflexibleservers.DatabasesClientListByServerResponse{ { - DatabaseList: armpostgresqlflexibleservers.DatabaseList{ - Value: []*armpostgresqlflexibleservers.Database{database1, database2}, - }, + Value: []*armpostgresqlflexibleservers.Database{database1, database2}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-administrator_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-administrator_test.go index 2ffbf003..59a39901 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-administrator_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-administrator_test.go @@ -178,9 +178,7 @@ func TestDBforPostgreSQLFlexibleServerAdministrator(t *testing.T) { mockPager := &mockAdministratorPager{ pages: []armpostgresqlflexibleservers.AdministratorsMicrosoftEntraClientListByServerResponse{ { - AdministratorMicrosoftEntraList: armpostgresqlflexibleservers.AdministratorMicrosoftEntraList{ - Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{admin1, admin2}, - }, + Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{admin1, admin2}, }, }, } @@ -250,9 +248,7 @@ func TestDBforPostgreSQLFlexibleServerAdministrator(t *testing.T) { mockPager := &mockAdministratorPager{ pages: []armpostgresqlflexibleservers.AdministratorsMicrosoftEntraClientListByServerResponse{ { - AdministratorMicrosoftEntraList: armpostgresqlflexibleservers.AdministratorMicrosoftEntraList{ - Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{admin1, admin2}, - }, + Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{admin1, admin2}, }, }, } @@ -349,9 +345,7 @@ func TestDBforPostgreSQLFlexibleServerAdministrator(t *testing.T) { mockPager := &mockAdministratorPager{ pages: []armpostgresqlflexibleservers.AdministratorsMicrosoftEntraClientListByServerResponse{ { - AdministratorMicrosoftEntraList: armpostgresqlflexibleservers.AdministratorMicrosoftEntraList{ - Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{nilNameAdmin, validAdmin}, - }, + Value: []*armpostgresqlflexibleservers.AdministratorMicrosoftEntra{nilNameAdmin, validAdmin}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-backup_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-backup_test.go index a32ffae1..9da6a0df 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-backup_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-backup_test.go @@ -161,9 +161,7 @@ func TestDBforPostgreSQLFlexibleServerBackup(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerBackupPager{ pages: []armpostgresqlflexibleservers.BackupsAutomaticAndOnDemandClientListByServerResponse{ { - BackupAutomaticAndOnDemandList: armpostgresqlflexibleservers.BackupAutomaticAndOnDemandList{ - Value: []*armpostgresqlflexibleservers.BackupAutomaticAndOnDemand{backup1, backup2}, - }, + Value: []*armpostgresqlflexibleservers.BackupAutomaticAndOnDemand{backup1, backup2}, }, }, } @@ -196,9 +194,7 @@ func TestDBforPostgreSQLFlexibleServerBackup(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerBackupPager{ pages: []armpostgresqlflexibleservers.BackupsAutomaticAndOnDemandClientListByServerResponse{ { - BackupAutomaticAndOnDemandList: armpostgresqlflexibleservers.BackupAutomaticAndOnDemandList{ - Value: []*armpostgresqlflexibleservers.BackupAutomaticAndOnDemand{backup1}, - }, + Value: []*armpostgresqlflexibleservers.BackupAutomaticAndOnDemand{backup1}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-configuration_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-configuration_test.go index d8b5664d..b2ef6fda 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-configuration_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-configuration_test.go @@ -131,9 +131,7 @@ func TestDBforPostgreSQLFlexibleServerConfiguration(t *testing.T) { mockPager := &mockConfigurationsPager{ pages: []armpostgresqlflexibleservers.ConfigurationsClientListByServerResponse{ { - ConfigurationList: armpostgresqlflexibleservers.ConfigurationList{ - Value: []*armpostgresqlflexibleservers.Configuration{config1, config2}, - }, + Value: []*armpostgresqlflexibleservers.Configuration{config1, config2}, }, }, } @@ -179,9 +177,7 @@ func TestDBforPostgreSQLFlexibleServerConfiguration(t *testing.T) { mockPager := &mockConfigurationsPager{ pages: []armpostgresqlflexibleservers.ConfigurationsClientListByServerResponse{ { - ConfigurationList: armpostgresqlflexibleservers.ConfigurationList{ - Value: []*armpostgresqlflexibleservers.Configuration{config1, config2}, - }, + Value: []*armpostgresqlflexibleservers.Configuration{config1, config2}, }, }, } @@ -305,11 +301,9 @@ func TestDBforPostgreSQLFlexibleServerConfiguration(t *testing.T) { mockPager := &mockConfigurationsPager{ pages: []armpostgresqlflexibleservers.ConfigurationsClientListByServerResponse{ { - ConfigurationList: armpostgresqlflexibleservers.ConfigurationList{ - Value: []*armpostgresqlflexibleservers.Configuration{ - {Name: nil}, // Configuration with nil name should be skipped - configWithName, - }, + Value: []*armpostgresqlflexibleservers.Configuration{ + {Name: nil}, // Configuration with nil name should be skipped + configWithName, }, }, }, diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-firewall-rule_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-firewall-rule_test.go index 58891de8..e1ac0479 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-firewall-rule_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-firewall-rule_test.go @@ -163,9 +163,7 @@ func TestDBforPostgreSQLFlexibleServerFirewallRule(t *testing.T) { pager := &mockPostgreSQLFlexibleServerFirewallRulePager{ pages: []armpostgresqlflexibleservers.FirewallRulesClientListByServerResponse{ { - FirewallRuleList: armpostgresqlflexibleservers.FirewallRuleList{ - Value: []*armpostgresqlflexibleservers.FirewallRule{rule1, rule2}, - }, + Value: []*armpostgresqlflexibleservers.FirewallRule{rule1, rule2}, }, }, } @@ -198,9 +196,7 @@ func TestDBforPostgreSQLFlexibleServerFirewallRule(t *testing.T) { pager := &mockPostgreSQLFlexibleServerFirewallRulePager{ pages: []armpostgresqlflexibleservers.FirewallRulesClientListByServerResponse{ { - FirewallRuleList: armpostgresqlflexibleservers.FirewallRuleList{ - Value: []*armpostgresqlflexibleservers.FirewallRule{rule1}, - }, + Value: []*armpostgresqlflexibleservers.FirewallRule{rule1}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-private-endpoint-connection_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-private-endpoint-connection_test.go index 22334460..33050ebc 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-private-endpoint-connection_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-private-endpoint-connection_test.go @@ -160,9 +160,7 @@ func TestDBforPostgreSQLFlexibleServerPrivateEndpointConnection(t *testing.T) { mockPager := &mockDBforPostgreSQLFlexibleServerPrivateEndpointConnectionsPager{ pages: []armpostgresqlflexibleservers.PrivateEndpointConnectionsClientListByServerResponse{ { - PrivateEndpointConnectionList: armpostgresqlflexibleservers.PrivateEndpointConnectionList{ - Value: []*armpostgresqlflexibleservers.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armpostgresqlflexibleservers.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -193,12 +191,10 @@ func TestDBforPostgreSQLFlexibleServerPrivateEndpointConnection(t *testing.T) { mockPager := &mockDBforPostgreSQLFlexibleServerPrivateEndpointConnectionsPager{ pages: []armpostgresqlflexibleservers.PrivateEndpointConnectionsClientListByServerResponse{ { - PrivateEndpointConnectionList: armpostgresqlflexibleservers.PrivateEndpointConnectionList{ - Value: []*armpostgresqlflexibleservers.PrivateEndpointConnection{ - nil, - {Name: nil}, - validConn, - }, + Value: []*armpostgresqlflexibleservers.PrivateEndpointConnection{ + nil, + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-replica_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-replica_test.go index 4b5c111a..0229c454 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-replica_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-replica_test.go @@ -172,9 +172,7 @@ func TestDBforPostgreSQLFlexibleServerReplica(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerReplicaPager{ pages: []armpostgresqlflexibleservers.ReplicasClientListByServerResponse{ { - ServerList: armpostgresqlflexibleservers.ServerList{ - Value: []*armpostgresqlflexibleservers.Server{replica1, replica2}, - }, + Value: []*armpostgresqlflexibleservers.Server{replica1, replica2}, }, }, } @@ -207,9 +205,7 @@ func TestDBforPostgreSQLFlexibleServerReplica(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerReplicaPager{ pages: []armpostgresqlflexibleservers.ReplicasClientListByServerResponse{ { - ServerList: armpostgresqlflexibleservers.ServerList{ - Value: []*armpostgresqlflexibleservers.Server{replica1}, - }, + Value: []*armpostgresqlflexibleservers.Server{replica1}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server-virtual-endpoint_test.go b/sources/azure/manual/dbforpostgresql-flexible-server-virtual-endpoint_test.go index 538bc4a9..456a6b18 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server-virtual-endpoint_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server-virtual-endpoint_test.go @@ -174,9 +174,7 @@ func TestDBforPostgreSQLFlexibleServerVirtualEndpoint(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerVirtualEndpointPager{ pages: []armpostgresqlflexibleservers.VirtualEndpointsClientListByServerResponse{ { - VirtualEndpointsList: armpostgresqlflexibleservers.VirtualEndpointsList{ - Value: []*armpostgresqlflexibleservers.VirtualEndpoint{virtualEndpoint1, virtualEndpoint2}, - }, + Value: []*armpostgresqlflexibleservers.VirtualEndpoint{virtualEndpoint1, virtualEndpoint2}, }, }, } @@ -209,9 +207,7 @@ func TestDBforPostgreSQLFlexibleServerVirtualEndpoint(t *testing.T) { pager := &mockDBforPostgreSQLFlexibleServerVirtualEndpointPager{ pages: []armpostgresqlflexibleservers.VirtualEndpointsClientListByServerResponse{ { - VirtualEndpointsList: armpostgresqlflexibleservers.VirtualEndpointsList{ - Value: []*armpostgresqlflexibleservers.VirtualEndpoint{virtualEndpoint1}, - }, + Value: []*armpostgresqlflexibleservers.VirtualEndpoint{virtualEndpoint1}, }, }, } diff --git a/sources/azure/manual/dbforpostgresql-flexible-server_test.go b/sources/azure/manual/dbforpostgresql-flexible-server_test.go index 3819152e..8b38dd33 100644 --- a/sources/azure/manual/dbforpostgresql-flexible-server_test.go +++ b/sources/azure/manual/dbforpostgresql-flexible-server_test.go @@ -282,9 +282,7 @@ func TestDBforPostgreSQLFlexibleServer(t *testing.T) { mockPager := &mockPostgreSQLFlexibleServersPager{ pages: []armpostgresqlflexibleservers.ServersClientListByResourceGroupResponse{ { - ServerList: armpostgresqlflexibleservers.ServerList{ - Value: []*armpostgresqlflexibleservers.Server{server1, server2}, - }, + Value: []*armpostgresqlflexibleservers.Server{server1, server2}, }, }, } @@ -335,9 +333,7 @@ func TestDBforPostgreSQLFlexibleServer(t *testing.T) { mockPager := &mockPostgreSQLFlexibleServersPager{ pages: []armpostgresqlflexibleservers.ServersClientListByResourceGroupResponse{ { - ServerList: armpostgresqlflexibleservers.ServerList{ - Value: []*armpostgresqlflexibleservers.Server{server1, server2}, - }, + Value: []*armpostgresqlflexibleservers.Server{server1, server2}, }, }, } diff --git a/sources/azure/manual/documentdb-database-accounts.go b/sources/azure/manual/documentdb-database-accounts.go index 7901faa7..88b25049 100644 --- a/sources/azure/manual/documentdb-database-accounts.go +++ b/sources/azure/manual/documentdb-database-accounts.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/documentdb-database-accounts_test.go b/sources/azure/manual/documentdb-database-accounts_test.go index 4cb492a6..552a1989 100644 --- a/sources/azure/manual/documentdb-database-accounts_test.go +++ b/sources/azure/manual/documentdb-database-accounts_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -226,9 +226,7 @@ func TestDocumentDBDatabaseAccounts(t *testing.T) { mockPager := &mockDocumentDBDatabaseAccountsPager{ pages: []armcosmos.DatabaseAccountsClientListByResourceGroupResponse{ { - DatabaseAccountsListResult: armcosmos.DatabaseAccountsListResult{ - Value: []*armcosmos.DatabaseAccountGetResults{account1, account2}, - }, + Value: []*armcosmos.DatabaseAccountGetResults{account1, account2}, }, }, } @@ -389,7 +387,7 @@ func createAzureCosmosDBAccount(accountName, provisioningState, subscriptionID, }, Identity: &armcosmos.ManagedServiceIdentity{ Type: new(armcosmos.ResourceIdentityTypeUserAssigned), - UserAssignedIdentities: map[string]*armcosmos.Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties{ + UserAssignedIdentities: map[string]*armcosmos.ManagedServiceIdentityUserAssignedIdentities{ "/subscriptions/" + subscriptionID + "/resourceGroups/" + resourceGroup + "/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity": {}, "/subscriptions/" + subscriptionID + "/resourceGroups/identity-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity-diff-rg": {}, }, @@ -440,7 +438,7 @@ func createAzureCosmosDBAccountCrossRG(accountName, provisioningState, subscript }, Identity: &armcosmos.ManagedServiceIdentity{ Type: new(armcosmos.ResourceIdentityTypeUserAssigned), - UserAssignedIdentities: map[string]*armcosmos.Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties{ + UserAssignedIdentities: map[string]*armcosmos.ManagedServiceIdentityUserAssignedIdentities{ "/subscriptions/" + subscriptionID + "/resourceGroups/identity-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity": {}, }, }, diff --git a/sources/azure/manual/documentdb-private-endpoint-connection.go b/sources/azure/manual/documentdb-private-endpoint-connection.go index 8a2d5efa..21d3fdb9 100644 --- a/sources/azure/manual/documentdb-private-endpoint-connection.go +++ b/sources/azure/manual/documentdb-private-endpoint-connection.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/documentdb-private-endpoint-connection_test.go b/sources/azure/manual/documentdb-private-endpoint-connection_test.go index ed53de9f..31db13a3 100644 --- a/sources/azure/manual/documentdb-private-endpoint-connection_test.go +++ b/sources/azure/manual/documentdb-private-endpoint-connection_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -175,9 +175,7 @@ func TestDocumentDBPrivateEndpointConnection(t *testing.T) { mockPager := &mockDocumentDBPrivateEndpointConnectionsPager{ pages: []armcosmos.PrivateEndpointConnectionsClientListByDatabaseAccountResponse{ { - PrivateEndpointConnectionListResult: armcosmos.PrivateEndpointConnectionListResult{ - Value: []*armcosmos.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armcosmos.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -221,11 +219,9 @@ func TestDocumentDBPrivateEndpointConnection(t *testing.T) { mockPager := &mockDocumentDBPrivateEndpointConnectionsPager{ pages: []armcosmos.PrivateEndpointConnectionsClientListByDatabaseAccountResponse{ { - PrivateEndpointConnectionListResult: armcosmos.PrivateEndpointConnectionListResult{ - Value: []*armcosmos.PrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armcosmos.PrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/elastic-san-volume-group_test.go b/sources/azure/manual/elastic-san-volume-group_test.go index baa27c54..9e9e61d1 100644 --- a/sources/azure/manual/elastic-san-volume-group_test.go +++ b/sources/azure/manual/elastic-san-volume-group_test.go @@ -155,9 +155,7 @@ func TestElasticSanVolumeGroup(t *testing.T) { mockPager := &mockElasticSanVolumeGroupPager{ pages: []armelasticsan.VolumeGroupsClientListByElasticSanResponse{ { - VolumeGroupList: armelasticsan.VolumeGroupList{ - Value: []*armelasticsan.VolumeGroup{vg1, vg2}, - }, + Value: []*armelasticsan.VolumeGroup{vg1, vg2}, }, }, } @@ -192,9 +190,7 @@ func TestElasticSanVolumeGroup(t *testing.T) { mockPager := &mockElasticSanVolumeGroupPager{ pages: []armelasticsan.VolumeGroupsClientListByElasticSanResponse{ { - VolumeGroupList: armelasticsan.VolumeGroupList{ - Value: []*armelasticsan.VolumeGroup{vg}, - }, + Value: []*armelasticsan.VolumeGroup{vg}, }, }, } diff --git a/sources/azure/manual/elastic-san-volume-snapshot_test.go b/sources/azure/manual/elastic-san-volume-snapshot_test.go index 83595296..d63142b2 100644 --- a/sources/azure/manual/elastic-san-volume-snapshot_test.go +++ b/sources/azure/manual/elastic-san-volume-snapshot_test.go @@ -156,9 +156,7 @@ func TestElasticSanVolumeSnapshot(t *testing.T) { mockPager := &mockElasticSanVolumeSnapshotPager{ pages: []armelasticsan.VolumeSnapshotsClientListByVolumeGroupResponse{ { - SnapshotList: armelasticsan.SnapshotList{ - Value: []*armelasticsan.Snapshot{snapshot1, snapshot2}, - }, + Value: []*armelasticsan.Snapshot{snapshot1, snapshot2}, }, }, } @@ -193,9 +191,7 @@ func TestElasticSanVolumeSnapshot(t *testing.T) { mockPager := &mockElasticSanVolumeSnapshotPager{ pages: []armelasticsan.VolumeSnapshotsClientListByVolumeGroupResponse{ { - SnapshotList: armelasticsan.SnapshotList{ - Value: []*armelasticsan.Snapshot{snapshot}, - }, + Value: []*armelasticsan.Snapshot{snapshot}, }, }, } diff --git a/sources/azure/manual/elastic-san-volume_test.go b/sources/azure/manual/elastic-san-volume_test.go index d2a26bc7..0773507b 100644 --- a/sources/azure/manual/elastic-san-volume_test.go +++ b/sources/azure/manual/elastic-san-volume_test.go @@ -228,9 +228,7 @@ func TestElasticSanVolume(t *testing.T) { mockPager := &mockElasticSanVolumePager{ pages: []armelasticsan.VolumesClientListByVolumeGroupResponse{ { - VolumeList: armelasticsan.VolumeList{ - Value: []*armelasticsan.Volume{vol1, vol2}, - }, + Value: []*armelasticsan.Volume{vol1, vol2}, }, }, } @@ -299,9 +297,7 @@ func TestElasticSanVolume(t *testing.T) { mockPager := &mockElasticSanVolumePager{ pages: []armelasticsan.VolumesClientListByVolumeGroupResponse{ { - VolumeList: armelasticsan.VolumeList{ - Value: []*armelasticsan.Volume{vol}, - }, + Value: []*armelasticsan.Volume{vol}, }, }, } diff --git a/sources/azure/manual/elastic-san_test.go b/sources/azure/manual/elastic-san_test.go index d21dade0..ea174bea 100644 --- a/sources/azure/manual/elastic-san_test.go +++ b/sources/azure/manual/elastic-san_test.go @@ -170,7 +170,7 @@ func TestElasticSan(t *testing.T) { mockClient := mocks.NewMockElasticSanClient(ctrl) mockPager := &mockElasticSanPager{ pages: []armelasticsan.ElasticSansClientListByResourceGroupResponse{ - {List: armelasticsan.List{Value: []*armelasticsan.ElasticSan{es1, es2}}}, + {Value: []*armelasticsan.ElasticSan{es1, es2}}, }, } mockClient.EXPECT().NewListByResourceGroupPager(resourceGroup, nil).Return(mockPager) @@ -205,7 +205,7 @@ func TestElasticSan(t *testing.T) { mockClient := mocks.NewMockElasticSanClient(ctrl) mockPager := &mockElasticSanPager{ pages: []armelasticsan.ElasticSansClientListByResourceGroupResponse{ - {List: armelasticsan.List{Value: []*armelasticsan.ElasticSan{es}}}, + {Value: []*armelasticsan.ElasticSan{es}}, }, } mockClient.EXPECT().NewListByResourceGroupPager(resourceGroup, nil).Return(mockPager) @@ -261,7 +261,7 @@ func TestElasticSan(t *testing.T) { mockClient := mocks.NewMockElasticSanClient(ctrl) mockPager := &mockElasticSanPager{ pages: []armelasticsan.ElasticSansClientListByResourceGroupResponse{ - {List: armelasticsan.List{Value: []*armelasticsan.ElasticSan{es1, esNilName}}}, + {Value: []*armelasticsan.ElasticSan{es1, esNilName}}, }, } mockClient.EXPECT().NewListByResourceGroupPager(resourceGroup, nil).Return(mockPager) diff --git a/sources/azure/manual/keyvault-key_test.go b/sources/azure/manual/keyvault-key_test.go index 1fc3e1f0..39399866 100644 --- a/sources/azure/manual/keyvault-key_test.go +++ b/sources/azure/manual/keyvault-key_test.go @@ -220,11 +220,9 @@ func TestKeyVaultKey(t *testing.T) { mockPager := &mockKeysPager{ pages: []armkeyvault.KeysClientListResponse{ { - KeyListResult: armkeyvault.KeyListResult{ - Value: []*armkeyvault.Key{ - {ID: key1.ID, Name: key1.Name, Type: key1.Type, Properties: key1.Properties, Tags: key1.Tags}, - {ID: key2.ID, Name: key2.Name, Type: key2.Type, Properties: key2.Properties, Tags: key2.Tags}, - }, + Value: []*armkeyvault.Key{ + {ID: key1.ID, Name: key1.Name, Type: key1.Type, Properties: key1.Properties, Tags: key1.Tags}, + {ID: key2.ID, Name: key2.Name, Type: key2.Type, Properties: key2.Properties, Tags: key2.Tags}, }, }, }, @@ -294,11 +292,9 @@ func TestKeyVaultKey(t *testing.T) { mockPager := &mockKeysPager{ pages: []armkeyvault.KeysClientListResponse{ { - KeyListResult: armkeyvault.KeyListResult{ - Value: []*armkeyvault.Key{ - {Name: nil}, - {ID: validKey.ID, Name: validKey.Name, Type: validKey.Type, Properties: validKey.Properties, Tags: validKey.Tags}, - }, + Value: []*armkeyvault.Key{ + {Name: nil}, + {ID: validKey.ID, Name: validKey.Name, Type: validKey.Type, Properties: validKey.Properties, Tags: validKey.Tags}, }, }, }, diff --git a/sources/azure/manual/keyvault-managed-hsm-private-endpoint-connection_test.go b/sources/azure/manual/keyvault-managed-hsm-private-endpoint-connection_test.go index 2f727524..8c4d1882 100644 --- a/sources/azure/manual/keyvault-managed-hsm-private-endpoint-connection_test.go +++ b/sources/azure/manual/keyvault-managed-hsm-private-endpoint-connection_test.go @@ -175,9 +175,7 @@ func TestKeyVaultManagedHSMPrivateEndpointConnection(t *testing.T) { mockPager := &mockKeyVaultManagedHSMPrivateEndpointConnectionsPager{ pages: []armkeyvault.MHSMPrivateEndpointConnectionsClientListByResourceResponse{ { - MHSMPrivateEndpointConnectionsListResult: armkeyvault.MHSMPrivateEndpointConnectionsListResult{ - Value: []*armkeyvault.MHSMPrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armkeyvault.MHSMPrivateEndpointConnection{conn1, conn2}, }, }, } @@ -221,11 +219,9 @@ func TestKeyVaultManagedHSMPrivateEndpointConnection(t *testing.T) { mockPager := &mockKeyVaultManagedHSMPrivateEndpointConnectionsPager{ pages: []armkeyvault.MHSMPrivateEndpointConnectionsClientListByResourceResponse{ { - MHSMPrivateEndpointConnectionsListResult: armkeyvault.MHSMPrivateEndpointConnectionsListResult{ - Value: []*armkeyvault.MHSMPrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armkeyvault.MHSMPrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/keyvault-managed-hsm_test.go b/sources/azure/manual/keyvault-managed-hsm_test.go index 49d81ab9..9f3622e9 100644 --- a/sources/azure/manual/keyvault-managed-hsm_test.go +++ b/sources/azure/manual/keyvault-managed-hsm_test.go @@ -252,9 +252,7 @@ func TestKeyVaultManagedHSM(t *testing.T) { mockPager := &mockManagedHSMsPager{ pages: []armkeyvault.ManagedHsmsClientListByResourceGroupResponse{ { - ManagedHsmListResult: armkeyvault.ManagedHsmListResult{ - Value: []*armkeyvault.ManagedHsm{hsm1, hsm2}, - }, + Value: []*armkeyvault.ManagedHsm{hsm1, hsm2}, }, }, } @@ -333,9 +331,7 @@ func TestKeyVaultManagedHSM(t *testing.T) { mockPager := &mockManagedHSMsPager{ pages: []armkeyvault.ManagedHsmsClientListByResourceGroupResponse{ { - ManagedHsmListResult: armkeyvault.ManagedHsmListResult{ - Value: []*armkeyvault.ManagedHsm{hsm1, hsm2, hsm3}, - }, + Value: []*armkeyvault.ManagedHsm{hsm1, hsm2, hsm3}, }, }, } @@ -374,9 +370,7 @@ func TestKeyVaultManagedHSM(t *testing.T) { mockPager := &mockManagedHSMsPager{ pages: []armkeyvault.ManagedHsmsClientListByResourceGroupResponse{ { - ManagedHsmListResult: armkeyvault.ManagedHsmListResult{ - Value: []*armkeyvault.ManagedHsm{hsm1, hsm2}, - }, + Value: []*armkeyvault.ManagedHsm{hsm1, hsm2}, }, }, } @@ -488,9 +482,7 @@ func TestKeyVaultManagedHSM(t *testing.T) { mockPager := &mockManagedHSMsPager{ pages: []armkeyvault.ManagedHsmsClientListByResourceGroupResponse{ { - ManagedHsmListResult: armkeyvault.ManagedHsmListResult{ - Value: []*armkeyvault.ManagedHsm{hsm1, hsm2, hsm3}, - }, + Value: []*armkeyvault.ManagedHsm{hsm1, hsm2, hsm3}, }, }, } diff --git a/sources/azure/manual/keyvault-secret_test.go b/sources/azure/manual/keyvault-secret_test.go index 4d2252e6..d83156ff 100644 --- a/sources/azure/manual/keyvault-secret_test.go +++ b/sources/azure/manual/keyvault-secret_test.go @@ -235,22 +235,20 @@ func TestKeyVaultSecret(t *testing.T) { mockPager := &mockSecretsPager{ pages: []armkeyvault.SecretsClientListResponse{ { - SecretListResult: armkeyvault.SecretListResult{ - Value: []*armkeyvault.Secret{ - { - ID: secret1.ID, - Name: secret1.Name, - Type: secret1.Type, - Properties: secret1.Properties, - Tags: secret1.Tags, - }, - { - ID: secret2.ID, - Name: secret2.Name, - Type: secret2.Type, - Properties: secret2.Properties, - Tags: secret2.Tags, - }, + Value: []*armkeyvault.Secret{ + { + ID: secret1.ID, + Name: secret1.Name, + Type: secret1.Type, + Properties: secret1.Properties, + Tags: secret1.Tags, + }, + { + ID: secret2.ID, + Name: secret2.Name, + Type: secret2.Type, + Properties: secret2.Properties, + Tags: secret2.Tags, }, }, }, @@ -324,19 +322,17 @@ func TestKeyVaultSecret(t *testing.T) { mockPager := &mockSecretsPager{ pages: []armkeyvault.SecretsClientListResponse{ { - SecretListResult: armkeyvault.SecretListResult{ - Value: []*armkeyvault.Secret{ - { - // Secret with nil name should be skipped - Name: nil, - }, - { - ID: validSecret.ID, - Name: validSecret.Name, - Type: validSecret.Type, - Properties: validSecret.Properties, - Tags: validSecret.Tags, - }, + Value: []*armkeyvault.Secret{ + { + // Secret with nil name should be skipped + Name: nil, + }, + { + ID: validSecret.ID, + Name: validSecret.Name, + Type: validSecret.Type, + Properties: validSecret.Properties, + Tags: validSecret.Tags, }, }, }, diff --git a/sources/azure/manual/keyvault-vault_test.go b/sources/azure/manual/keyvault-vault_test.go index f134231a..eec9ed16 100644 --- a/sources/azure/manual/keyvault-vault_test.go +++ b/sources/azure/manual/keyvault-vault_test.go @@ -239,9 +239,7 @@ func TestKeyVaultVault(t *testing.T) { mockPager := &mockVaultsPager{ pages: []armkeyvault.VaultsClientListByResourceGroupResponse{ { - VaultListResult: armkeyvault.VaultListResult{ - Value: []*armkeyvault.Vault{vault1, vault2}, - }, + Value: []*armkeyvault.Vault{vault1, vault2}, }, }, } diff --git a/sources/azure/manual/maintenance-maintenance-configuration_test.go b/sources/azure/manual/maintenance-maintenance-configuration_test.go index efd07716..dfdaab05 100644 --- a/sources/azure/manual/maintenance-maintenance-configuration_test.go +++ b/sources/azure/manual/maintenance-maintenance-configuration_test.go @@ -255,9 +255,7 @@ func (m *mockMaintenanceConfigurationPager) NextPage(ctx context.Context) (armma if m.index >= len(m.items) { m.more = false return armmaintenance.ConfigurationsForResourceGroupClientListResponse{ - ListMaintenanceConfigurationsResult: armmaintenance.ListMaintenanceConfigurationsResult{ - Value: []*armmaintenance.Configuration{}, - }, + Value: []*armmaintenance.Configuration{}, }, nil } @@ -266,8 +264,6 @@ func (m *mockMaintenanceConfigurationPager) NextPage(ctx context.Context) (armma m.more = m.index < len(m.items) return armmaintenance.ConfigurationsForResourceGroupClientListResponse{ - ListMaintenanceConfigurationsResult: armmaintenance.ListMaintenanceConfigurationsResult{ - Value: []*armmaintenance.Configuration{item}, - }, + Value: []*armmaintenance.Configuration{item}, }, nil } diff --git a/sources/azure/manual/managedidentity-federated-identity-credential_test.go b/sources/azure/manual/managedidentity-federated-identity-credential_test.go index ba894d04..c3f1328c 100644 --- a/sources/azure/manual/managedidentity-federated-identity-credential_test.go +++ b/sources/azure/manual/managedidentity-federated-identity-credential_test.go @@ -184,9 +184,7 @@ func TestManagedIdentityFederatedIdentityCredential(t *testing.T) { mockPager := &mockFederatedIdentityCredentialsPager{ pages: []armmsi.FederatedIdentityCredentialsClientListResponse{ { - FederatedIdentityCredentialsListResult: armmsi.FederatedIdentityCredentialsListResult{ - Value: []*armmsi.FederatedIdentityCredential{credential1, credential2}, - }, + Value: []*armmsi.FederatedIdentityCredential{credential1, credential2}, }, }, } @@ -232,9 +230,7 @@ func TestManagedIdentityFederatedIdentityCredential(t *testing.T) { mockPager := &mockFederatedIdentityCredentialsPager{ pages: []armmsi.FederatedIdentityCredentialsClientListResponse{ { - FederatedIdentityCredentialsListResult: armmsi.FederatedIdentityCredentialsListResult{ - Value: []*armmsi.FederatedIdentityCredential{credential1, credential2}, - }, + Value: []*armmsi.FederatedIdentityCredential{credential1, credential2}, }, }, } @@ -309,11 +305,9 @@ func TestManagedIdentityFederatedIdentityCredential(t *testing.T) { mockPager := &mockFederatedIdentityCredentialsPager{ pages: []armmsi.FederatedIdentityCredentialsClientListResponse{ { - FederatedIdentityCredentialsListResult: armmsi.FederatedIdentityCredentialsListResult{ - Value: []*armmsi.FederatedIdentityCredential{ - {Name: nil}, - createAzureFederatedIdentityCredential("valid-credential"), - }, + Value: []*armmsi.FederatedIdentityCredential{ + {Name: nil}, + createAzureFederatedIdentityCredential("valid-credential"), }, }, }, diff --git a/sources/azure/manual/managedidentity-user-assigned-identity_test.go b/sources/azure/manual/managedidentity-user-assigned-identity_test.go index c952d3bb..55512a52 100644 --- a/sources/azure/manual/managedidentity-user-assigned-identity_test.go +++ b/sources/azure/manual/managedidentity-user-assigned-identity_test.go @@ -338,9 +338,7 @@ func (m *mockUserAssignedIdentitiesPager) NextPage(ctx context.Context) (armmsi. if m.index >= len(m.items) { m.more = false return armmsi.UserAssignedIdentitiesClientListByResourceGroupResponse{ - UserAssignedIdentitiesListResult: armmsi.UserAssignedIdentitiesListResult{ - Value: []*armmsi.Identity{}, - }, + Value: []*armmsi.Identity{}, }, nil } @@ -349,9 +347,7 @@ func (m *mockUserAssignedIdentitiesPager) NextPage(ctx context.Context) (armmsi. m.more = m.index < len(m.items) return armmsi.UserAssignedIdentitiesClientListByResourceGroupResponse{ - UserAssignedIdentitiesListResult: armmsi.UserAssignedIdentitiesListResult{ - Value: []*armmsi.Identity{item}, - }, + Value: []*armmsi.Identity{item}, }, nil } diff --git a/sources/azure/manual/network-application-gateway.go b/sources/azure/manual/network-application-gateway.go index 97fd89cf..86665dc8 100644 --- a/sources/azure/manual/network-application-gateway.go +++ b/sources/azure/manual/network-application-gateway.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-application-gateway_test.go b/sources/azure/manual/network-application-gateway_test.go index fd910bed..0e3b7594 100644 --- a/sources/azure/manual/network-application-gateway_test.go +++ b/sources/azure/manual/network-application-gateway_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -292,9 +292,7 @@ func TestNetworkApplicationGateway(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.ApplicationGatewaysClientListResponse{ - ApplicationGatewayListResult: armnetwork.ApplicationGatewayListResult{ - Value: []*armnetwork.ApplicationGateway{ag1, ag2}, - }, + Value: []*armnetwork.ApplicationGateway{ag1, ag2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -351,9 +349,7 @@ func TestNetworkApplicationGateway(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.ApplicationGatewaysClientListResponse{ - ApplicationGatewayListResult: armnetwork.ApplicationGatewayListResult{ - Value: []*armnetwork.ApplicationGateway{ag1, ag2}, - }, + Value: []*armnetwork.ApplicationGateway{ag1, ag2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -680,7 +676,7 @@ func createAzureApplicationGateway(agName, subscriptionID, resourceGroup string) }, Identity: &armnetwork.ManagedServiceIdentity{ Type: new(armnetwork.ResourceIdentityTypeUserAssigned), - UserAssignedIdentities: map[string]*armnetwork.Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties{ + UserAssignedIdentities: map[string]*armnetwork.ManagedServiceIdentityUserAssignedIdentities{ "/subscriptions/" + subscriptionID + "/resourceGroups/" + resourceGroup + "/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity": {}, }, }, diff --git a/sources/azure/manual/network-application-security-group.go b/sources/azure/manual/network-application-security-group.go index 186b2e41..13fb0267 100644 --- a/sources/azure/manual/network-application-security-group.go +++ b/sources/azure/manual/network-application-security-group.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-application-security-group_test.go b/sources/azure/manual/network-application-security-group_test.go index 7fb3c306..5252d693 100644 --- a/sources/azure/manual/network-application-security-group_test.go +++ b/sources/azure/manual/network-application-security-group_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -307,18 +307,14 @@ func (m *mockApplicationSecurityGroupsPager) NextPage(ctx context.Context) (armn if m.index >= len(m.items) { m.more = false return armnetwork.ApplicationSecurityGroupsClientListResponse{ - ApplicationSecurityGroupListResult: armnetwork.ApplicationSecurityGroupListResult{ - Value: []*armnetwork.ApplicationSecurityGroup{}, - }, + Value: []*armnetwork.ApplicationSecurityGroup{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.ApplicationSecurityGroupsClientListResponse{ - ApplicationSecurityGroupListResult: armnetwork.ApplicationSecurityGroupListResult{ - Value: []*armnetwork.ApplicationSecurityGroup{item}, - }, + Value: []*armnetwork.ApplicationSecurityGroup{item}, }, nil } diff --git a/sources/azure/manual/network-ddos-protection-plan.go b/sources/azure/manual/network-ddos-protection-plan.go index 0089e967..acaf89ba 100644 --- a/sources/azure/manual/network-ddos-protection-plan.go +++ b/sources/azure/manual/network-ddos-protection-plan.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-ddos-protection-plan_test.go b/sources/azure/manual/network-ddos-protection-plan_test.go index f8274bd6..72c97b0b 100644 --- a/sources/azure/manual/network-ddos-protection-plan_test.go +++ b/sources/azure/manual/network-ddos-protection-plan_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -351,18 +351,14 @@ func (m *mockDdosProtectionPlansPager) NextPage(ctx context.Context) (armnetwork if m.index >= len(m.items) { m.more = false return armnetwork.DdosProtectionPlansClientListByResourceGroupResponse{ - DdosProtectionPlanListResult: armnetwork.DdosProtectionPlanListResult{ - Value: []*armnetwork.DdosProtectionPlan{}, - }, + Value: []*armnetwork.DdosProtectionPlan{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.DdosProtectionPlansClientListByResourceGroupResponse{ - DdosProtectionPlanListResult: armnetwork.DdosProtectionPlanListResult{ - Value: []*armnetwork.DdosProtectionPlan{item}, - }, + Value: []*armnetwork.DdosProtectionPlan{item}, }, nil } diff --git a/sources/azure/manual/network-default-security-rule.go b/sources/azure/manual/network-default-security-rule.go index 84ed19f2..b63368bc 100644 --- a/sources/azure/manual/network-default-security-rule.go +++ b/sources/azure/manual/network-default-security-rule.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-default-security-rule_test.go b/sources/azure/manual/network-default-security-rule_test.go index d900b59b..29a39576 100644 --- a/sources/azure/manual/network-default-security-rule_test.go +++ b/sources/azure/manual/network-default-security-rule_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -153,9 +153,7 @@ func TestNetworkDefaultSecurityRule(t *testing.T) { mockPager := &mockDefaultSecurityRulesPager{ pages: []armnetwork.DefaultSecurityRulesClientListResponse{ { - SecurityRuleListResult: armnetwork.SecurityRuleListResult{ - Value: []*armnetwork.SecurityRule{&rule1, &rule2}, - }, + Value: []*armnetwork.SecurityRule{&rule1, &rule2}, }, }, } @@ -211,11 +209,9 @@ func TestNetworkDefaultSecurityRule(t *testing.T) { mockPager := &mockDefaultSecurityRulesPager{ pages: []armnetwork.DefaultSecurityRulesClientListResponse{ { - SecurityRuleListResult: armnetwork.SecurityRuleListResult{ - Value: []*armnetwork.SecurityRule{ - {Name: nil, ID: new(string)}, - &validRule, - }, + Value: []*armnetwork.SecurityRule{ + {Name: nil, ID: new(string)}, + &validRule, }, }, }, diff --git a/sources/azure/manual/network-dns-record-set_test.go b/sources/azure/manual/network-dns-record-set_test.go index 4ab57c26..f3232750 100644 --- a/sources/azure/manual/network-dns-record-set_test.go +++ b/sources/azure/manual/network-dns-record-set_test.go @@ -147,9 +147,7 @@ func TestNetworkDNSRecordSet(t *testing.T) { mockPager := &mockRecordSetsPager{ pages: []armdns.RecordSetsClientListAllByDNSZoneResponse{ { - RecordSetListResult: armdns.RecordSetListResult{ - Value: []*armdns.RecordSet{rs1, rs2}, - }, + Value: []*armdns.RecordSet{rs1, rs2}, }, }, } @@ -184,9 +182,7 @@ func TestNetworkDNSRecordSet(t *testing.T) { mockPager := &mockRecordSetsPager{ pages: []armdns.RecordSetsClientListAllByDNSZoneResponse{ { - RecordSetListResult: armdns.RecordSetListResult{ - Value: []*armdns.RecordSet{rs}, - }, + Value: []*armdns.RecordSet{rs}, }, }, } diff --git a/sources/azure/manual/network-dns-virtual-network-link_test.go b/sources/azure/manual/network-dns-virtual-network-link_test.go index 387cf743..65674168 100644 --- a/sources/azure/manual/network-dns-virtual-network-link_test.go +++ b/sources/azure/manual/network-dns-virtual-network-link_test.go @@ -62,9 +62,7 @@ func newMockVirtualNetworkLinksPager(_ *gomock.Controller, items []*armprivatedn return &mockVirtualNetworkLinksPager{ pages: []armprivatedns.VirtualNetworkLinksClientListResponse{ { - VirtualNetworkLinkListResult: armprivatedns.VirtualNetworkLinkListResult{ - Value: items, - }, + Value: items, }, }, } diff --git a/sources/azure/manual/network-flow-log.go b/sources/azure/manual/network-flow-log.go index 36f8085d..881d28e4 100644 --- a/sources/azure/manual/network-flow-log.go +++ b/sources/azure/manual/network-flow-log.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-flow-log_test.go b/sources/azure/manual/network-flow-log_test.go index c6134621..f081fb48 100644 --- a/sources/azure/manual/network-flow-log_test.go +++ b/sources/azure/manual/network-flow-log_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -258,9 +258,7 @@ func TestNetworkFlowLog(t *testing.T) { mockPager := &mockFlowLogsPager{ pages: []armnetwork.FlowLogsClientListResponse{ { - FlowLogListResult: armnetwork.FlowLogListResult{ - Value: []*armnetwork.FlowLog{flowLog1, flowLog2}, - }, + Value: []*armnetwork.FlowLog{flowLog1, flowLog2}, }, }, } @@ -316,11 +314,9 @@ func TestNetworkFlowLog(t *testing.T) { mockPager := &mockFlowLogsPager{ pages: []armnetwork.FlowLogsClientListResponse{ { - FlowLogListResult: armnetwork.FlowLogListResult{ - Value: []*armnetwork.FlowLog{ - {Name: nil, ID: new("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/some/id")}, - validFlowLog, - }, + Value: []*armnetwork.FlowLog{ + {Name: nil, ID: new("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/some/id")}, + validFlowLog, }, }, }, @@ -469,7 +465,7 @@ func createAzureFlowLog(name, networkWatcherName, subscriptionID, resourceGroup "env": new("test"), }, Identity: &armnetwork.ManagedServiceIdentity{ - UserAssignedIdentities: map[string]*armnetwork.Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties{ + UserAssignedIdentities: map[string]*armnetwork.ManagedServiceIdentityUserAssignedIdentities{ identityID: {}, }, }, diff --git a/sources/azure/manual/network-ip-group.go b/sources/azure/manual/network-ip-group.go index 0bcb1fca..f89c097b 100644 --- a/sources/azure/manual/network-ip-group.go +++ b/sources/azure/manual/network-ip-group.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-ip-group_test.go b/sources/azure/manual/network-ip-group_test.go index c3cf14b4..8eaaa294 100644 --- a/sources/azure/manual/network-ip-group_test.go +++ b/sources/azure/manual/network-ip-group_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -374,18 +374,14 @@ func (m *mockIPGroupsPager) NextPage(ctx context.Context) (armnetwork.IPGroupsCl if m.index >= len(m.items) { m.more = false return armnetwork.IPGroupsClientListByResourceGroupResponse{ - IPGroupListResult: armnetwork.IPGroupListResult{ - Value: []*armnetwork.IPGroup{}, - }, + Value: []*armnetwork.IPGroup{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.IPGroupsClientListByResourceGroupResponse{ - IPGroupListResult: armnetwork.IPGroupListResult{ - Value: []*armnetwork.IPGroup{item}, - }, + Value: []*armnetwork.IPGroup{item}, }, nil } diff --git a/sources/azure/manual/network-load-balancer-backend-address-pool.go b/sources/azure/manual/network-load-balancer-backend-address-pool.go index 2123f296..db14c3a0 100644 --- a/sources/azure/manual/network-load-balancer-backend-address-pool.go +++ b/sources/azure/manual/network-load-balancer-backend-address-pool.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-load-balancer-backend-address-pool_test.go b/sources/azure/manual/network-load-balancer-backend-address-pool_test.go index cb6a1251..2ec8ad13 100644 --- a/sources/azure/manual/network-load-balancer-backend-address-pool_test.go +++ b/sources/azure/manual/network-load-balancer-backend-address-pool_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -227,9 +227,7 @@ func TestNetworkLoadBalancerBackendAddressPool(t *testing.T) { mockPager := &mockBackendAddressPoolPager{ pages: []armnetwork.LoadBalancerBackendAddressPoolsClientListResponse{ { - LoadBalancerBackendAddressPoolListResult: armnetwork.LoadBalancerBackendAddressPoolListResult{ - Value: []*armnetwork.BackendAddressPool{pool1, pool2}, - }, + Value: []*armnetwork.BackendAddressPool{pool1, pool2}, }, }, } @@ -273,11 +271,9 @@ func TestNetworkLoadBalancerBackendAddressPool(t *testing.T) { mockPager := &mockBackendAddressPoolPager{ pages: []armnetwork.LoadBalancerBackendAddressPoolsClientListResponse{ { - LoadBalancerBackendAddressPoolListResult: armnetwork.LoadBalancerBackendAddressPoolListResult{ - Value: []*armnetwork.BackendAddressPool{ - {Name: nil, ID: new("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/some/id")}, - validPool, - }, + Value: []*armnetwork.BackendAddressPool{ + {Name: nil, ID: new("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/some/id")}, + validPool, }, }, }, diff --git a/sources/azure/manual/network-load-balancer-frontend-ip-configuration.go b/sources/azure/manual/network-load-balancer-frontend-ip-configuration.go index c5a02aaf..1b808918 100644 --- a/sources/azure/manual/network-load-balancer-frontend-ip-configuration.go +++ b/sources/azure/manual/network-load-balancer-frontend-ip-configuration.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-load-balancer-frontend-ip-configuration_test.go b/sources/azure/manual/network-load-balancer-frontend-ip-configuration_test.go index 1ccea60a..13578694 100644 --- a/sources/azure/manual/network-load-balancer-frontend-ip-configuration_test.go +++ b/sources/azure/manual/network-load-balancer-frontend-ip-configuration_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -227,9 +227,7 @@ func TestNetworkLoadBalancerFrontendIPConfiguration(t *testing.T) { mockPager := &mockFrontendIPConfigPager{ pages: []armnetwork.LoadBalancerFrontendIPConfigurationsClientListResponse{ { - LoadBalancerFrontendIPConfigurationListResult: armnetwork.LoadBalancerFrontendIPConfigurationListResult{ - Value: []*armnetwork.FrontendIPConfiguration{frontendIP1, frontendIP2}, - }, + Value: []*armnetwork.FrontendIPConfiguration{frontendIP1, frontendIP2}, }, }, } @@ -273,11 +271,9 @@ func TestNetworkLoadBalancerFrontendIPConfiguration(t *testing.T) { mockPager := &mockFrontendIPConfigPager{ pages: []armnetwork.LoadBalancerFrontendIPConfigurationsClientListResponse{ { - LoadBalancerFrontendIPConfigurationListResult: armnetwork.LoadBalancerFrontendIPConfigurationListResult{ - Value: []*armnetwork.FrontendIPConfiguration{ - {Name: nil, ID: new("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/some/id")}, - validFrontendIP, - }, + Value: []*armnetwork.FrontendIPConfiguration{ + {Name: nil, ID: new("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/some/id")}, + validFrontendIP, }, }, }, diff --git a/sources/azure/manual/network-load-balancer-probe.go b/sources/azure/manual/network-load-balancer-probe.go index bfabe1aa..42493e7a 100644 --- a/sources/azure/manual/network-load-balancer-probe.go +++ b/sources/azure/manual/network-load-balancer-probe.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-load-balancer-probe_test.go b/sources/azure/manual/network-load-balancer-probe_test.go index 4d423376..34871e45 100644 --- a/sources/azure/manual/network-load-balancer-probe_test.go +++ b/sources/azure/manual/network-load-balancer-probe_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -179,9 +179,7 @@ func TestNetworkLoadBalancerProbe(t *testing.T) { mockPager := &mockLoadBalancerProbePager{ pages: []armnetwork.LoadBalancerProbesClientListResponse{ { - LoadBalancerProbeListResult: armnetwork.LoadBalancerProbeListResult{ - Value: []*armnetwork.Probe{probe1, probe2}, - }, + Value: []*armnetwork.Probe{probe1, probe2}, }, }, } @@ -225,11 +223,9 @@ func TestNetworkLoadBalancerProbe(t *testing.T) { mockPager := &mockLoadBalancerProbePager{ pages: []armnetwork.LoadBalancerProbesClientListResponse{ { - LoadBalancerProbeListResult: armnetwork.LoadBalancerProbeListResult{ - Value: []*armnetwork.Probe{ - {Name: nil, ID: new("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/some/id")}, - validProbe, - }, + Value: []*armnetwork.Probe{ + {Name: nil, ID: new("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/some/id")}, + validProbe, }, }, }, diff --git a/sources/azure/manual/network-load-balancer.go b/sources/azure/manual/network-load-balancer.go index 3b3081dd..36f9805f 100644 --- a/sources/azure/manual/network-load-balancer.go +++ b/sources/azure/manual/network-load-balancer.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-load-balancer_test.go b/sources/azure/manual/network-load-balancer_test.go index f61ae1f4..fc0f75a7 100644 --- a/sources/azure/manual/network-load-balancer_test.go +++ b/sources/azure/manual/network-load-balancer_test.go @@ -8,7 +8,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -164,9 +164,7 @@ func TestNetworkLoadBalancer(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.LoadBalancersClientListResponse{ - LoadBalancerListResult: armnetwork.LoadBalancerListResult{ - Value: []*armnetwork.LoadBalancer{lb1, lb2}, - }, + Value: []*armnetwork.LoadBalancer{lb1, lb2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -225,9 +223,7 @@ func TestNetworkLoadBalancer(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.LoadBalancersClientListResponse{ - LoadBalancerListResult: armnetwork.LoadBalancerListResult{ - Value: []*armnetwork.LoadBalancer{lb1, lb2}, - }, + Value: []*armnetwork.LoadBalancer{lb1, lb2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-local-network-gateway.go b/sources/azure/manual/network-local-network-gateway.go index 8185b1fd..8fe6ddc6 100644 --- a/sources/azure/manual/network-local-network-gateway.go +++ b/sources/azure/manual/network-local-network-gateway.go @@ -5,7 +5,7 @@ import ( "errors" "net" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-local-network-gateway_test.go b/sources/azure/manual/network-local-network-gateway_test.go index 376a290f..179154fc 100644 --- a/sources/azure/manual/network-local-network-gateway_test.go +++ b/sources/azure/manual/network-local-network-gateway_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -331,18 +331,14 @@ func (m *mockLocalNetworkGatewaysPager) NextPage(ctx context.Context) (armnetwor if m.index >= len(m.items) { m.more = false return armnetwork.LocalNetworkGatewaysClientListResponse{ - LocalNetworkGatewayListResult: armnetwork.LocalNetworkGatewayListResult{ - Value: []*armnetwork.LocalNetworkGateway{}, - }, + Value: []*armnetwork.LocalNetworkGateway{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.LocalNetworkGatewaysClientListResponse{ - LocalNetworkGatewayListResult: armnetwork.LocalNetworkGatewayListResult{ - Value: []*armnetwork.LocalNetworkGateway{item}, - }, + Value: []*armnetwork.LocalNetworkGateway{item}, }, nil } diff --git a/sources/azure/manual/network-nat-gateway.go b/sources/azure/manual/network-nat-gateway.go index db10b89e..7c938f91 100644 --- a/sources/azure/manual/network-nat-gateway.go +++ b/sources/azure/manual/network-nat-gateway.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-nat-gateway_test.go b/sources/azure/manual/network-nat-gateway_test.go index 79fac9e8..d2a2ed8c 100644 --- a/sources/azure/manual/network-nat-gateway_test.go +++ b/sources/azure/manual/network-nat-gateway_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -298,18 +298,14 @@ func (m *mockNatGatewaysPager) NextPage(ctx context.Context) (armnetwork.NatGate if m.index >= len(m.items) { m.more = false return armnetwork.NatGatewaysClientListResponse{ - NatGatewayListResult: armnetwork.NatGatewayListResult{ - Value: []*armnetwork.NatGateway{}, - }, + Value: []*armnetwork.NatGateway{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.NatGatewaysClientListResponse{ - NatGatewayListResult: armnetwork.NatGatewayListResult{ - Value: []*armnetwork.NatGateway{item}, - }, + Value: []*armnetwork.NatGateway{item}, }, nil } diff --git a/sources/azure/manual/network-network-interface-ip-configuration.go b/sources/azure/manual/network-network-interface-ip-configuration.go index 52a0424b..035bc3e3 100644 --- a/sources/azure/manual/network-network-interface-ip-configuration.go +++ b/sources/azure/manual/network-network-interface-ip-configuration.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-network-interface-ip-configuration_test.go b/sources/azure/manual/network-network-interface-ip-configuration_test.go index a516371b..b47fc1a2 100644 --- a/sources/azure/manual/network-network-interface-ip-configuration_test.go +++ b/sources/azure/manual/network-network-interface-ip-configuration_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -221,9 +221,7 @@ func TestNetworkNetworkInterfaceIPConfiguration(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.InterfaceIPConfigurationsClientListResponse{ - InterfaceIPConfigurationListResult: armnetwork.InterfaceIPConfigurationListResult{ - Value: []*armnetwork.InterfaceIPConfiguration{ipConfig1, ipConfig2}, - }, + Value: []*armnetwork.InterfaceIPConfiguration{ipConfig1, ipConfig2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -300,9 +298,7 @@ func TestNetworkNetworkInterfaceIPConfiguration(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.InterfaceIPConfigurationsClientListResponse{ - InterfaceIPConfigurationListResult: armnetwork.InterfaceIPConfigurationListResult{ - Value: []*armnetwork.InterfaceIPConfiguration{ipConfigNilName, ipConfigValid}, - }, + Value: []*armnetwork.InterfaceIPConfiguration{ipConfigNilName, ipConfigValid}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-network-interface.go b/sources/azure/manual/network-network-interface.go index c8f52a0b..e66b839e 100644 --- a/sources/azure/manual/network-network-interface.go +++ b/sources/azure/manual/network-network-interface.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-network-interface_test.go b/sources/azure/manual/network-network-interface_test.go index 206bc780..82c170fc 100644 --- a/sources/azure/manual/network-network-interface_test.go +++ b/sources/azure/manual/network-network-interface_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -178,9 +178,7 @@ func TestNetworkNetworkInterface(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.InterfacesClientListResponse{ - InterfaceListResult: armnetwork.InterfaceListResult{ - Value: []*armnetwork.Interface{nic1, nic2}, - }, + Value: []*armnetwork.Interface{nic1, nic2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -248,9 +246,7 @@ func TestNetworkNetworkInterface(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.InterfacesClientListResponse{ - InterfaceListResult: armnetwork.InterfaceListResult{ - Value: []*armnetwork.Interface{nic1, nic2}, - }, + Value: []*armnetwork.Interface{nic1, nic2}, }, nil), ) // Note: More() won't be called again after NextPage returns the items with nil name diff --git a/sources/azure/manual/network-network-security-group.go b/sources/azure/manual/network-network-security-group.go index 1a6cfe95..59eced2a 100644 --- a/sources/azure/manual/network-network-security-group.go +++ b/sources/azure/manual/network-network-security-group.go @@ -6,7 +6,7 @@ import ( "net" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-network-security-group_test.go b/sources/azure/manual/network-network-security-group_test.go index 27e656e7..97e21b32 100644 --- a/sources/azure/manual/network-network-security-group_test.go +++ b/sources/azure/manual/network-network-security-group_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -167,9 +167,7 @@ func TestNetworkNetworkSecurityGroup(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.SecurityGroupsClientListResponse{ - SecurityGroupListResult: armnetwork.SecurityGroupListResult{ - Value: []*armnetwork.SecurityGroup{nsg1, nsg2}, - }, + Value: []*armnetwork.SecurityGroup{nsg1, nsg2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -227,9 +225,7 @@ func TestNetworkNetworkSecurityGroup(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.SecurityGroupsClientListResponse{ - SecurityGroupListResult: armnetwork.SecurityGroupListResult{ - Value: []*armnetwork.SecurityGroup{nsg1, nsg2}, - }, + Value: []*armnetwork.SecurityGroup{nsg1, nsg2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-network-watcher.go b/sources/azure/manual/network-network-watcher.go index 95bd6a7d..ea0e21ab 100644 --- a/sources/azure/manual/network-network-watcher.go +++ b/sources/azure/manual/network-network-watcher.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-network-watcher_test.go b/sources/azure/manual/network-network-watcher_test.go index 5cc235fb..d57d4437 100644 --- a/sources/azure/manual/network-network-watcher_test.go +++ b/sources/azure/manual/network-network-watcher_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -309,9 +309,7 @@ func (m *mockNetworkWatchersPager) NextPage(ctx context.Context) (armnetwork.Wat if m.index >= len(m.items) { m.more = false return armnetwork.WatchersClientListResponse{ - WatcherListResult: armnetwork.WatcherListResult{ - Value: []*armnetwork.Watcher{}, - }, + Value: []*armnetwork.Watcher{}, }, nil } @@ -320,8 +318,6 @@ func (m *mockNetworkWatchersPager) NextPage(ctx context.Context) (armnetwork.Wat m.more = m.index < len(m.items) return armnetwork.WatchersClientListResponse{ - WatcherListResult: armnetwork.WatcherListResult{ - Value: []*armnetwork.Watcher{item}, - }, + Value: []*armnetwork.Watcher{item}, }, nil } diff --git a/sources/azure/manual/network-private-dns-zone_test.go b/sources/azure/manual/network-private-dns-zone_test.go index f3fa0fef..14f62ae0 100644 --- a/sources/azure/manual/network-private-dns-zone_test.go +++ b/sources/azure/manual/network-private-dns-zone_test.go @@ -338,18 +338,14 @@ func (m *mockPrivateDNSZonesPager) NextPage(ctx context.Context) (armprivatedns. if m.index >= len(m.items) { m.more = false return armprivatedns.PrivateZonesClientListByResourceGroupResponse{ - PrivateZoneListResult: armprivatedns.PrivateZoneListResult{ - Value: []*armprivatedns.PrivateZone{}, - }, + Value: []*armprivatedns.PrivateZone{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armprivatedns.PrivateZonesClientListByResourceGroupResponse{ - PrivateZoneListResult: armprivatedns.PrivateZoneListResult{ - Value: []*armprivatedns.PrivateZone{item}, - }, + Value: []*armprivatedns.PrivateZone{item}, }, nil } diff --git a/sources/azure/manual/network-private-endpoint.go b/sources/azure/manual/network-private-endpoint.go index b4abcbe8..dc15ebc3 100644 --- a/sources/azure/manual/network-private-endpoint.go +++ b/sources/azure/manual/network-private-endpoint.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-private-endpoint_test.go b/sources/azure/manual/network-private-endpoint_test.go index 73ce8c7d..1612922f 100644 --- a/sources/azure/manual/network-private-endpoint_test.go +++ b/sources/azure/manual/network-private-endpoint_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -131,9 +131,7 @@ func TestNetworkPrivateEndpoint(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PrivateEndpointsClientListResponse{ - PrivateEndpointListResult: armnetwork.PrivateEndpointListResult{ - Value: []*armnetwork.PrivateEndpoint{pe1, pe2}, - }, + Value: []*armnetwork.PrivateEndpoint{pe1, pe2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -185,9 +183,7 @@ func TestNetworkPrivateEndpoint(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PrivateEndpointsClientListResponse{ - PrivateEndpointListResult: armnetwork.PrivateEndpointListResult{ - Value: []*armnetwork.PrivateEndpoint{pe1, pe2}, - }, + Value: []*armnetwork.PrivateEndpoint{pe1, pe2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-private-link-service.go b/sources/azure/manual/network-private-link-service.go index 0cd92611..f1cd904b 100644 --- a/sources/azure/manual/network-private-link-service.go +++ b/sources/azure/manual/network-private-link-service.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-private-link-service_test.go b/sources/azure/manual/network-private-link-service_test.go index 829654e7..c4924407 100644 --- a/sources/azure/manual/network-private-link-service_test.go +++ b/sources/azure/manual/network-private-link-service_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -162,9 +162,7 @@ func TestNetworkPrivateLinkService(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PrivateLinkServicesClientListResponse{ - PrivateLinkServiceListResult: armnetwork.PrivateLinkServiceListResult{ - Value: []*armnetwork.PrivateLinkService{pls1, pls2}, - }, + Value: []*armnetwork.PrivateLinkService{pls1, pls2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -209,9 +207,7 @@ func TestNetworkPrivateLinkService(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PrivateLinkServicesClientListResponse{ - PrivateLinkServiceListResult: armnetwork.PrivateLinkServiceListResult{ - Value: []*armnetwork.PrivateLinkService{pls1, pls2}, - }, + Value: []*armnetwork.PrivateLinkService{pls1, pls2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -272,9 +268,7 @@ func TestNetworkPrivateLinkService(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PrivateLinkServicesClientListResponse{ - PrivateLinkServiceListResult: armnetwork.PrivateLinkServiceListResult{ - Value: []*armnetwork.PrivateLinkService{pls1, pls2}, - }, + Value: []*armnetwork.PrivateLinkService{pls1, pls2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-public-ip-address.go b/sources/azure/manual/network-public-ip-address.go index 1206a087..b0442d7c 100644 --- a/sources/azure/manual/network-public-ip-address.go +++ b/sources/azure/manual/network-public-ip-address.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-public-ip-address_test.go b/sources/azure/manual/network-public-ip-address_test.go index a69c1a61..7377e913 100644 --- a/sources/azure/manual/network-public-ip-address_test.go +++ b/sources/azure/manual/network-public-ip-address_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -230,9 +230,7 @@ func TestNetworkPublicIPAddress(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PublicIPAddressesClientListResponse{ - PublicIPAddressListResult: armnetwork.PublicIPAddressListResult{ - Value: []*armnetwork.PublicIPAddress{publicIP1, publicIP2}, - }, + Value: []*armnetwork.PublicIPAddress{publicIP1, publicIP2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -293,9 +291,7 @@ func TestNetworkPublicIPAddress(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.PublicIPAddressesClientListResponse{ - PublicIPAddressListResult: armnetwork.PublicIPAddressListResult{ - Value: []*armnetwork.PublicIPAddress{publicIP1, publicIP2}, - }, + Value: []*armnetwork.PublicIPAddress{publicIP1, publicIP2}, }, nil), mockPager.EXPECT().More().Return(false), // No more pages after processing ) diff --git a/sources/azure/manual/network-public-ip-prefix.go b/sources/azure/manual/network-public-ip-prefix.go index 1a80b528..60ed23cc 100644 --- a/sources/azure/manual/network-public-ip-prefix.go +++ b/sources/azure/manual/network-public-ip-prefix.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-public-ip-prefix_test.go b/sources/azure/manual/network-public-ip-prefix_test.go index 67ad44cf..d880fa61 100644 --- a/sources/azure/manual/network-public-ip-prefix_test.go +++ b/sources/azure/manual/network-public-ip-prefix_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -383,18 +383,14 @@ func (m *mockPublicIPPrefixesPager) NextPage(ctx context.Context) (armnetwork.Pu if m.index >= len(m.items) { m.more = false return armnetwork.PublicIPPrefixesClientListResponse{ - PublicIPPrefixListResult: armnetwork.PublicIPPrefixListResult{ - Value: []*armnetwork.PublicIPPrefix{}, - }, + Value: []*armnetwork.PublicIPPrefix{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.PublicIPPrefixesClientListResponse{ - PublicIPPrefixListResult: armnetwork.PublicIPPrefixListResult{ - Value: []*armnetwork.PublicIPPrefix{item}, - }, + Value: []*armnetwork.PublicIPPrefix{item}, }, nil } diff --git a/sources/azure/manual/network-route-table.go b/sources/azure/manual/network-route-table.go index f1b50706..4fb3c8fc 100644 --- a/sources/azure/manual/network-route-table.go +++ b/sources/azure/manual/network-route-table.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-route-table_test.go b/sources/azure/manual/network-route-table_test.go index c7422ea4..7535f90e 100644 --- a/sources/azure/manual/network-route-table_test.go +++ b/sources/azure/manual/network-route-table_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -142,9 +142,7 @@ func TestNetworkRouteTable(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.RouteTablesClientListResponse{ - RouteTableListResult: armnetwork.RouteTableListResult{ - Value: []*armnetwork.RouteTable{routeTable1, routeTable2}, - }, + Value: []*armnetwork.RouteTable{routeTable1, routeTable2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -202,9 +200,7 @@ func TestNetworkRouteTable(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.RouteTablesClientListResponse{ - RouteTableListResult: armnetwork.RouteTableListResult{ - Value: []*armnetwork.RouteTable{routeTable1, routeTable2}, - }, + Value: []*armnetwork.RouteTable{routeTable1, routeTable2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/network-route.go b/sources/azure/manual/network-route.go index a7f66a12..b3b43b05 100644 --- a/sources/azure/manual/network-route.go +++ b/sources/azure/manual/network-route.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-route_test.go b/sources/azure/manual/network-route_test.go index 02775600..49bc469a 100644 --- a/sources/azure/manual/network-route_test.go +++ b/sources/azure/manual/network-route_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -160,9 +160,7 @@ func TestNetworkRoute(t *testing.T) { mockPager := &mockRoutesPager{ pages: []armnetwork.RoutesClientListResponse{ { - RouteListResult: armnetwork.RouteListResult{ - Value: []*armnetwork.Route{route1, route2}, - }, + Value: []*armnetwork.Route{route1, route2}, }, }, } @@ -218,11 +216,9 @@ func TestNetworkRoute(t *testing.T) { mockPager := &mockRoutesPager{ pages: []armnetwork.RoutesClientListResponse{ { - RouteListResult: armnetwork.RouteListResult{ - Value: []*armnetwork.Route{ - {Name: nil, ID: new("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/some/id")}, - validRoute, - }, + Value: []*armnetwork.Route{ + {Name: nil, ID: new("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/some/id")}, + validRoute, }, }, }, diff --git a/sources/azure/manual/network-security-rule.go b/sources/azure/manual/network-security-rule.go index fcaf5cc1..bffe5ee8 100644 --- a/sources/azure/manual/network-security-rule.go +++ b/sources/azure/manual/network-security-rule.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-security-rule_test.go b/sources/azure/manual/network-security-rule_test.go index 3f77f922..e1f3572a 100644 --- a/sources/azure/manual/network-security-rule_test.go +++ b/sources/azure/manual/network-security-rule_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -153,9 +153,7 @@ func TestNetworkSecurityRule(t *testing.T) { mockPager := &mockSecurityRulesPager{ pages: []armnetwork.SecurityRulesClientListResponse{ { - SecurityRuleListResult: armnetwork.SecurityRuleListResult{ - Value: []*armnetwork.SecurityRule{rule1, rule2}, - }, + Value: []*armnetwork.SecurityRule{rule1, rule2}, }, }, } @@ -211,11 +209,9 @@ func TestNetworkSecurityRule(t *testing.T) { mockPager := &mockSecurityRulesPager{ pages: []armnetwork.SecurityRulesClientListResponse{ { - SecurityRuleListResult: armnetwork.SecurityRuleListResult{ - Value: []*armnetwork.SecurityRule{ - {Name: nil, ID: new("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/some/id")}, - validRule, - }, + Value: []*armnetwork.SecurityRule{ + {Name: nil, ID: new("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/some/id")}, + validRule, }, }, }, diff --git a/sources/azure/manual/network-subnet.go b/sources/azure/manual/network-subnet.go index cd05b31c..cbaedc68 100644 --- a/sources/azure/manual/network-subnet.go +++ b/sources/azure/manual/network-subnet.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-subnet_test.go b/sources/azure/manual/network-subnet_test.go index 7e55e9d8..d6035da0 100644 --- a/sources/azure/manual/network-subnet_test.go +++ b/sources/azure/manual/network-subnet_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -139,9 +139,7 @@ func TestNetworkSubnet(t *testing.T) { mockPager := &mockSubnetsPager{ pages: []armnetwork.SubnetsClientListResponse{ { - SubnetListResult: armnetwork.SubnetListResult{ - Value: []*armnetwork.Subnet{subnet1, subnet2}, - }, + Value: []*armnetwork.Subnet{subnet1, subnet2}, }, }, } @@ -197,11 +195,9 @@ func TestNetworkSubnet(t *testing.T) { mockPager := &mockSubnetsPager{ pages: []armnetwork.SubnetsClientListResponse{ { - SubnetListResult: armnetwork.SubnetListResult{ - Value: []*armnetwork.Subnet{ - {Name: nil, ID: new("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/some/id")}, - validSubnet, - }, + Value: []*armnetwork.Subnet{ + {Name: nil, ID: new("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/some/id")}, + validSubnet, }, }, }, diff --git a/sources/azure/manual/network-virtual-network-gateway-connection.go b/sources/azure/manual/network-virtual-network-gateway-connection.go index fb0e74fb..bfa939b2 100644 --- a/sources/azure/manual/network-virtual-network-gateway-connection.go +++ b/sources/azure/manual/network-virtual-network-gateway-connection.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-virtual-network-gateway-connection_test.go b/sources/azure/manual/network-virtual-network-gateway-connection_test.go index 914a8efd..3aedd2a7 100644 --- a/sources/azure/manual/network-virtual-network-gateway-connection_test.go +++ b/sources/azure/manual/network-virtual-network-gateway-connection_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -60,80 +60,80 @@ func TestNetworkVirtualNetworkGatewayConnection(t *testing.T) { } t.Run("StaticTests", func(t *testing.T) { - queryTests := shared.QueryTests{ - { - ExpectedType: azureshared.NetworkVirtualNetworkGateway.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway1", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: azureshared.NetworkVirtualNetworkGateway.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway2", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: azureshared.NetworkLocalNetworkGateway.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "local-gw", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: azureshared.NetworkExpressRouteCircuitPeering.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "circuit1|peering1", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: azureshared.NetworkVirtualNetworkGatewayNatRule.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway1|egress-rule1", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: azureshared.NetworkVirtualNetworkGatewayNatRule.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway1|ingress-rule1", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: stdlib.NetworkIP.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "10.0.0.1", - ExpectedScope: "global", - }, - { - ExpectedType: azureshared.NetworkVirtualNetworkGatewayIPConfiguration.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway1|default", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: stdlib.NetworkIP.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "10.0.0.2", - ExpectedScope: "global", - }, - { - ExpectedType: azureshared.NetworkVirtualNetworkGatewayIPConfiguration.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "gateway2|default", - ExpectedScope: subscriptionID + "." + resourceGroup, - }, - { - ExpectedType: stdlib.NetworkIP.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "192.168.1.1", - ExpectedScope: "global", - }, - { - ExpectedType: stdlib.NetworkIP.String(), - ExpectedMethod: sdp.QueryMethod_GET, - ExpectedQuery: "10.1.1.1", - ExpectedScope: "global", - }, - } + queryTests := shared.QueryTests{ + { + ExpectedType: azureshared.NetworkVirtualNetworkGateway.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway1", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: azureshared.NetworkVirtualNetworkGateway.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway2", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: azureshared.NetworkLocalNetworkGateway.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "local-gw", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: azureshared.NetworkExpressRouteCircuitPeering.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "circuit1|peering1", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: azureshared.NetworkVirtualNetworkGatewayNatRule.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway1|egress-rule1", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: azureshared.NetworkVirtualNetworkGatewayNatRule.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway1|ingress-rule1", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: stdlib.NetworkIP.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "10.0.0.1", + ExpectedScope: "global", + }, + { + ExpectedType: azureshared.NetworkVirtualNetworkGatewayIPConfiguration.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway1|default", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: stdlib.NetworkIP.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "10.0.0.2", + ExpectedScope: "global", + }, + { + ExpectedType: azureshared.NetworkVirtualNetworkGatewayIPConfiguration.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "gateway2|default", + ExpectedScope: subscriptionID + "." + resourceGroup, + }, + { + ExpectedType: stdlib.NetworkIP.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "192.168.1.1", + ExpectedScope: "global", + }, + { + ExpectedType: stdlib.NetworkIP.String(), + ExpectedMethod: sdp.QueryMethod_GET, + ExpectedQuery: "10.1.1.1", + ExpectedScope: "global", + }, + } shared.RunStaticTests(t, adapter, sdpItem, queryTests) }) @@ -430,9 +430,7 @@ func (m *mockVirtualNetworkGatewayConnectionsPager) NextPage(ctx context.Context if m.index >= len(m.items) { m.more = false return armnetwork.VirtualNetworkGatewayConnectionsClientListResponse{ - VirtualNetworkGatewayConnectionListResult: armnetwork.VirtualNetworkGatewayConnectionListResult{ - Value: []*armnetwork.VirtualNetworkGatewayConnection{}, - }, + Value: []*armnetwork.VirtualNetworkGatewayConnection{}, }, nil } @@ -441,8 +439,6 @@ func (m *mockVirtualNetworkGatewayConnectionsPager) NextPage(ctx context.Context m.more = m.index < len(m.items) return armnetwork.VirtualNetworkGatewayConnectionsClientListResponse{ - VirtualNetworkGatewayConnectionListResult: armnetwork.VirtualNetworkGatewayConnectionListResult{ - Value: []*armnetwork.VirtualNetworkGatewayConnection{item}, - }, + Value: []*armnetwork.VirtualNetworkGatewayConnection{item}, }, nil } diff --git a/sources/azure/manual/network-virtual-network-gateway.go b/sources/azure/manual/network-virtual-network-gateway.go index 3ecf208e..100c1c82 100644 --- a/sources/azure/manual/network-virtual-network-gateway.go +++ b/sources/azure/manual/network-virtual-network-gateway.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-virtual-network-gateway_test.go b/sources/azure/manual/network-virtual-network-gateway_test.go index c0536c76..09f4dba8 100644 --- a/sources/azure/manual/network-virtual-network-gateway_test.go +++ b/sources/azure/manual/network-virtual-network-gateway_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -327,18 +327,14 @@ func (m *mockVirtualNetworkGatewaysPager) NextPage(ctx context.Context) (armnetw if m.index >= len(m.items) { m.more = false return armnetwork.VirtualNetworkGatewaysClientListResponse{ - VirtualNetworkGatewayListResult: armnetwork.VirtualNetworkGatewayListResult{ - Value: []*armnetwork.VirtualNetworkGateway{}, - }, + Value: []*armnetwork.VirtualNetworkGateway{}, }, nil } item := m.items[m.index] m.index++ m.more = m.index < len(m.items) return armnetwork.VirtualNetworkGatewaysClientListResponse{ - VirtualNetworkGatewayListResult: armnetwork.VirtualNetworkGatewayListResult{ - Value: []*armnetwork.VirtualNetworkGateway{item}, - }, + Value: []*armnetwork.VirtualNetworkGateway{item}, }, nil } diff --git a/sources/azure/manual/network-virtual-network-peering.go b/sources/azure/manual/network-virtual-network-peering.go index 99368906..39765e38 100644 --- a/sources/azure/manual/network-virtual-network-peering.go +++ b/sources/azure/manual/network-virtual-network-peering.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-virtual-network-peering_test.go b/sources/azure/manual/network-virtual-network-peering_test.go index 9ece09bf..bebf90e1 100644 --- a/sources/azure/manual/network-virtual-network-peering_test.go +++ b/sources/azure/manual/network-virtual-network-peering_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -153,9 +153,7 @@ func TestNetworkVirtualNetworkPeering(t *testing.T) { mockPager := &mockVirtualNetworkPeeringsPager{ pages: []armnetwork.VirtualNetworkPeeringsClientListResponse{ { - VirtualNetworkPeeringListResult: armnetwork.VirtualNetworkPeeringListResult{ - Value: []*armnetwork.VirtualNetworkPeering{peering1, peering2}, - }, + Value: []*armnetwork.VirtualNetworkPeering{peering1, peering2}, }, }, } @@ -211,11 +209,9 @@ func TestNetworkVirtualNetworkPeering(t *testing.T) { mockPager := &mockVirtualNetworkPeeringsPager{ pages: []armnetwork.VirtualNetworkPeeringsClientListResponse{ { - VirtualNetworkPeeringListResult: armnetwork.VirtualNetworkPeeringListResult{ - Value: []*armnetwork.VirtualNetworkPeering{ - {Name: nil, ID: new("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/some/id")}, - validPeering, - }, + Value: []*armnetwork.VirtualNetworkPeering{ + {Name: nil, ID: new("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/some/id")}, + validPeering, }, }, }, diff --git a/sources/azure/manual/network-virtual-network.go b/sources/azure/manual/network-virtual-network.go index 354f93f9..05544a25 100644 --- a/sources/azure/manual/network-virtual-network.go +++ b/sources/azure/manual/network-virtual-network.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "github.com/overmindtech/cli/go/discovery" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" diff --git a/sources/azure/manual/network-virtual-network_test.go b/sources/azure/manual/network-virtual-network_test.go index 8eda47f9..7fee1b7c 100644 --- a/sources/azure/manual/network-virtual-network_test.go +++ b/sources/azure/manual/network-virtual-network_test.go @@ -7,7 +7,7 @@ import ( "slices" "testing" - "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" "go.uber.org/mock/gomock" "github.com/overmindtech/cli/go/discovery" @@ -164,9 +164,7 @@ func TestNetworkVirtualNetwork(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.VirtualNetworksClientListResponse{ - VirtualNetworkListResult: armnetwork.VirtualNetworkListResult{ - Value: []*armnetwork.VirtualNetwork{vnet1, vnet2}, - }, + Value: []*armnetwork.VirtualNetwork{vnet1, vnet2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -229,9 +227,7 @@ func TestNetworkVirtualNetwork(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armnetwork.VirtualNetworksClientListResponse{ - VirtualNetworkListResult: armnetwork.VirtualNetworkListResult{ - Value: []*armnetwork.VirtualNetwork{vnet1, vnet2}, - }, + Value: []*armnetwork.VirtualNetwork{vnet1, vnet2}, }, nil), ) // Note: More() won't be called again after NextPage returns the items with nil name diff --git a/sources/azure/manual/network-zone_test.go b/sources/azure/manual/network-zone_test.go index e9493008..8d5a7782 100644 --- a/sources/azure/manual/network-zone_test.go +++ b/sources/azure/manual/network-zone_test.go @@ -186,9 +186,7 @@ func TestNetworkZone(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armdns.ZonesClientListByResourceGroupResponse{ - ZoneListResult: armdns.ZoneListResult{ - Value: []*armdns.Zone{zone1, zone2}, - }, + Value: []*armdns.Zone{zone1, zone2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -247,9 +245,7 @@ func TestNetworkZone(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armdns.ZonesClientListByResourceGroupResponse{ - ZoneListResult: armdns.ZoneListResult{ - Value: []*armdns.Zone{zone1, zone2}, - }, + Value: []*armdns.Zone{zone1, zone2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/operational-insights-workspace_test.go b/sources/azure/manual/operational-insights-workspace_test.go index 31f9fd29..285ed045 100644 --- a/sources/azure/manual/operational-insights-workspace_test.go +++ b/sources/azure/manual/operational-insights-workspace_test.go @@ -473,9 +473,7 @@ func (m *mockOperationalInsightsWorkspacePager) NextPage(ctx context.Context) (a if m.index >= len(m.items) { m.more = false return armoperationalinsights.WorkspacesClientListByResourceGroupResponse{ - WorkspaceListResult: armoperationalinsights.WorkspaceListResult{ - Value: []*armoperationalinsights.Workspace{}, - }, + Value: []*armoperationalinsights.Workspace{}, }, nil } @@ -484,8 +482,6 @@ func (m *mockOperationalInsightsWorkspacePager) NextPage(ctx context.Context) (a m.more = m.index < len(m.items) return armoperationalinsights.WorkspacesClientListByResourceGroupResponse{ - WorkspaceListResult: armoperationalinsights.WorkspaceListResult{ - Value: []*armoperationalinsights.Workspace{item}, - }, + Value: []*armoperationalinsights.Workspace{item}, }, nil } diff --git a/sources/azure/manual/sql-database-schema_test.go b/sources/azure/manual/sql-database-schema_test.go index da6fe7be..36f57bf4 100644 --- a/sources/azure/manual/sql-database-schema_test.go +++ b/sources/azure/manual/sql-database-schema_test.go @@ -192,9 +192,7 @@ func TestSqlDatabaseSchema(t *testing.T) { mockPager := &mockSqlDatabaseSchemasPager{ pages: []armsql.DatabaseSchemasClientListByDatabaseResponse{ { - DatabaseSchemaListResult: armsql.DatabaseSchemaListResult{ - Value: []*armsql.DatabaseSchema{schema1, schema2}, - }, + Value: []*armsql.DatabaseSchema{schema1, schema2}, }, }, } @@ -243,9 +241,7 @@ func TestSqlDatabaseSchema(t *testing.T) { mockPager := &mockSqlDatabaseSchemasPager{ pages: []armsql.DatabaseSchemasClientListByDatabaseResponse{ { - DatabaseSchemaListResult: armsql.DatabaseSchemaListResult{ - Value: []*armsql.DatabaseSchema{schema1, schema2}, - }, + Value: []*armsql.DatabaseSchema{schema1, schema2}, }, }, } diff --git a/sources/azure/manual/sql-database_test.go b/sources/azure/manual/sql-database_test.go index 4edf1864..ebbe56da 100644 --- a/sources/azure/manual/sql-database_test.go +++ b/sources/azure/manual/sql-database_test.go @@ -202,9 +202,7 @@ func TestSqlDatabase(t *testing.T) { mockPager := &mockSqlDatabasesPager{ pages: []armsql.DatabasesClientListByServerResponse{ { - DatabaseListResult: armsql.DatabaseListResult{ - Value: []*armsql.Database{database1, database2}, - }, + Value: []*armsql.Database{database1, database2}, }, }, } @@ -260,9 +258,7 @@ func TestSqlDatabase(t *testing.T) { mockPager := &mockSqlDatabasesPager{ pages: []armsql.DatabasesClientListByServerResponse{ { - DatabaseListResult: armsql.DatabaseListResult{ - Value: []*armsql.Database{database1, database2}, - }, + Value: []*armsql.Database{database1, database2}, }, }, } diff --git a/sources/azure/manual/sql-elastic-pool_test.go b/sources/azure/manual/sql-elastic-pool_test.go index 189eabca..a4a3b5b5 100644 --- a/sources/azure/manual/sql-elastic-pool_test.go +++ b/sources/azure/manual/sql-elastic-pool_test.go @@ -156,9 +156,7 @@ func TestSqlElasticPool(t *testing.T) { pager := &mockSqlElasticPoolPager{ pages: []armsql.ElasticPoolsClientListByServerResponse{ { - ElasticPoolListResult: armsql.ElasticPoolListResult{ - Value: []*armsql.ElasticPool{pool1, pool2}, - }, + Value: []*armsql.ElasticPool{pool1, pool2}, }, }, } @@ -192,9 +190,7 @@ func TestSqlElasticPool(t *testing.T) { pager := &mockSqlElasticPoolPager{ pages: []armsql.ElasticPoolsClientListByServerResponse{ { - ElasticPoolListResult: armsql.ElasticPoolListResult{ - Value: []*armsql.ElasticPool{pool}, - }, + Value: []*armsql.ElasticPool{pool}, }, }, } diff --git a/sources/azure/manual/sql-server-failover-group_test.go b/sources/azure/manual/sql-server-failover-group_test.go index 68f0eeb9..14ed3cd3 100644 --- a/sources/azure/manual/sql-server-failover-group_test.go +++ b/sources/azure/manual/sql-server-failover-group_test.go @@ -196,9 +196,7 @@ func TestSqlServerFailoverGroup(t *testing.T) { mockPager := &mockSqlFailoverGroupsPager{ pages: []armsql.FailoverGroupsClientListByServerResponse{ { - FailoverGroupListResult: armsql.FailoverGroupListResult{ - Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, - }, + Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, }, }, } @@ -244,9 +242,7 @@ func TestSqlServerFailoverGroup(t *testing.T) { mockPager := &mockSqlFailoverGroupsPager{ pages: []armsql.FailoverGroupsClientListByServerResponse{ { - FailoverGroupListResult: armsql.FailoverGroupListResult{ - Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, - }, + Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, }, }, } @@ -332,9 +328,7 @@ func TestSqlServerFailoverGroup(t *testing.T) { mockPager := &mockSqlFailoverGroupsPager{ pages: []armsql.FailoverGroupsClientListByServerResponse{ { - FailoverGroupListResult: armsql.FailoverGroupListResult{ - Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, - }, + Value: []*armsql.FailoverGroup{failoverGroup1, failoverGroup2}, }, }, } diff --git a/sources/azure/manual/sql-server-firewall-rule_test.go b/sources/azure/manual/sql-server-firewall-rule_test.go index 852d889b..33ff67b9 100644 --- a/sources/azure/manual/sql-server-firewall-rule_test.go +++ b/sources/azure/manual/sql-server-firewall-rule_test.go @@ -163,9 +163,7 @@ func TestSqlServerFirewallRule(t *testing.T) { pager := &mockSqlServerFirewallRulePager{ pages: []armsql.FirewallRulesClientListByServerResponse{ { - FirewallRuleListResult: armsql.FirewallRuleListResult{ - Value: []*armsql.FirewallRule{rule1, rule2}, - }, + Value: []*armsql.FirewallRule{rule1, rule2}, }, }, } @@ -198,9 +196,7 @@ func TestSqlServerFirewallRule(t *testing.T) { pager := &mockSqlServerFirewallRulePager{ pages: []armsql.FirewallRulesClientListByServerResponse{ { - FirewallRuleListResult: armsql.FirewallRuleListResult{ - Value: []*armsql.FirewallRule{rule1}, - }, + Value: []*armsql.FirewallRule{rule1}, }, }, } diff --git a/sources/azure/manual/sql-server-key_test.go b/sources/azure/manual/sql-server-key_test.go index 0d9337dc..0eca3e72 100644 --- a/sources/azure/manual/sql-server-key_test.go +++ b/sources/azure/manual/sql-server-key_test.go @@ -222,9 +222,7 @@ func TestSqlServerKey(t *testing.T) { mockPager := &mockSqlServerKeysPager{ pages: []armsql.ServerKeysClientListByServerResponse{ { - ServerKeyListResult: armsql.ServerKeyListResult{ - Value: []*armsql.ServerKey{serverKey1, serverKey2}, - }, + Value: []*armsql.ServerKey{serverKey1, serverKey2}, }, }, } @@ -270,9 +268,7 @@ func TestSqlServerKey(t *testing.T) { mockPager := &mockSqlServerKeysPager{ pages: []armsql.ServerKeysClientListByServerResponse{ { - ServerKeyListResult: armsql.ServerKeyListResult{ - Value: []*armsql.ServerKey{serverKey1, serverKey2}, - }, + Value: []*armsql.ServerKey{serverKey1, serverKey2}, }, }, } @@ -333,9 +329,7 @@ func TestSqlServerKey(t *testing.T) { mockPager := &mockSqlServerKeysPager{ pages: []armsql.ServerKeysClientListByServerResponse{ { - ServerKeyListResult: armsql.ServerKeyListResult{ - Value: []*armsql.ServerKey{serverKey1, serverKey2}, - }, + Value: []*armsql.ServerKey{serverKey1, serverKey2}, }, }, } diff --git a/sources/azure/manual/sql-server-private-endpoint-connection_test.go b/sources/azure/manual/sql-server-private-endpoint-connection_test.go index 8108db7c..eae0de00 100644 --- a/sources/azure/manual/sql-server-private-endpoint-connection_test.go +++ b/sources/azure/manual/sql-server-private-endpoint-connection_test.go @@ -175,9 +175,7 @@ func TestSQLServerPrivateEndpointConnection(t *testing.T) { mockPager := &mockSQLServerPrivateEndpointConnectionsPager{ pages: []armsql.PrivateEndpointConnectionsClientListByServerResponse{ { - PrivateEndpointConnectionListResult: armsql.PrivateEndpointConnectionListResult{ - Value: []*armsql.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armsql.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -221,11 +219,9 @@ func TestSQLServerPrivateEndpointConnection(t *testing.T) { mockPager := &mockSQLServerPrivateEndpointConnectionsPager{ pages: []armsql.PrivateEndpointConnectionsClientListByServerResponse{ { - PrivateEndpointConnectionListResult: armsql.PrivateEndpointConnectionListResult{ - Value: []*armsql.PrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armsql.PrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/sql-server-virtual-network-rule_test.go b/sources/azure/manual/sql-server-virtual-network-rule_test.go index 5c65953b..19f770fb 100644 --- a/sources/azure/manual/sql-server-virtual-network-rule_test.go +++ b/sources/azure/manual/sql-server-virtual-network-rule_test.go @@ -194,9 +194,7 @@ func TestSqlServerVirtualNetworkRule(t *testing.T) { pager := &mockSqlServerVirtualNetworkRulePager{ pages: []armsql.VirtualNetworkRulesClientListByServerResponse{ { - VirtualNetworkRuleListResult: armsql.VirtualNetworkRuleListResult{ - Value: []*armsql.VirtualNetworkRule{rule1, rule2}, - }, + Value: []*armsql.VirtualNetworkRule{rule1, rule2}, }, }, } @@ -229,9 +227,7 @@ func TestSqlServerVirtualNetworkRule(t *testing.T) { pager := &mockSqlServerVirtualNetworkRulePager{ pages: []armsql.VirtualNetworkRulesClientListByServerResponse{ { - VirtualNetworkRuleListResult: armsql.VirtualNetworkRuleListResult{ - Value: []*armsql.VirtualNetworkRule{rule1}, - }, + Value: []*armsql.VirtualNetworkRule{rule1}, }, }, } diff --git a/sources/azure/manual/sql-server_test.go b/sources/azure/manual/sql-server_test.go index dff19ec1..6b144f9a 100644 --- a/sources/azure/manual/sql-server_test.go +++ b/sources/azure/manual/sql-server_test.go @@ -591,9 +591,7 @@ func TestSqlServer(t *testing.T) { mockPager := &mockSqlServersPager{ pages: []armsql.ServersClientListByResourceGroupResponse{ { - ServerListResult: armsql.ServerListResult{ - Value: []*armsql.Server{server1, server2}, - }, + Value: []*armsql.Server{server1, server2}, }, }, } @@ -652,9 +650,7 @@ func TestSqlServer(t *testing.T) { mockPager := &mockSqlServersPager{ pages: []armsql.ServersClientListByResourceGroupResponse{ { - ServerListResult: armsql.ServerListResult{ - Value: []*armsql.Server{server1, server2}, - }, + Value: []*armsql.Server{server1, server2}, }, }, } @@ -695,9 +691,7 @@ func TestSqlServer(t *testing.T) { mockPager := &mockSqlServersPager{ pages: []armsql.ServersClientListByResourceGroupResponse{ { - ServerListResult: armsql.ServerListResult{ - Value: []*armsql.Server{server1, server2}, - }, + Value: []*armsql.Server{server1, server2}, }, }, } diff --git a/sources/azure/manual/storage-account_test.go b/sources/azure/manual/storage-account_test.go index db942f3d..656036fe 100644 --- a/sources/azure/manual/storage-account_test.go +++ b/sources/azure/manual/storage-account_test.go @@ -154,9 +154,7 @@ func TestStorageAccount(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armstorage.AccountsClientListByResourceGroupResponse{ - AccountListResult: armstorage.AccountListResult{ - Value: []*armstorage.Account{account1, account2}, - }, + Value: []*armstorage.Account{account1, account2}, }, nil), mockPager.EXPECT().More().Return(false), ) @@ -217,9 +215,7 @@ func TestStorageAccount(t *testing.T) { mockPager.EXPECT().More().Return(true), mockPager.EXPECT().NextPage(ctx).Return( armstorage.AccountsClientListByResourceGroupResponse{ - AccountListResult: armstorage.AccountListResult{ - Value: []*armstorage.Account{account1, account2}, - }, + Value: []*armstorage.Account{account1, account2}, }, nil), mockPager.EXPECT().More().Return(false), ) diff --git a/sources/azure/manual/storage-blob-container_test.go b/sources/azure/manual/storage-blob-container_test.go index e0a12eba..d9c53280 100644 --- a/sources/azure/manual/storage-blob-container_test.go +++ b/sources/azure/manual/storage-blob-container_test.go @@ -236,26 +236,24 @@ func TestStorageBlobContainer(t *testing.T) { mockPager := &mockBlobContainersPager{ pages: []armstorage.BlobContainersClientListResponse{ { - ListContainerItems: armstorage.ListContainerItems{ - Value: []*armstorage.ListContainerItem{ - { - ID: container1.ID, - Name: container1.Name, - Type: container1.Type, - Properties: &armstorage.ContainerProperties{ - PublicAccess: container1.ContainerProperties.PublicAccess, - }, - Etag: container1.Etag, + Value: []*armstorage.ListContainerItem{ + { + ID: container1.ID, + Name: container1.Name, + Type: container1.Type, + Properties: &armstorage.ContainerProperties{ + PublicAccess: container1.ContainerProperties.PublicAccess, }, - { - ID: container2.ID, - Name: container2.Name, - Type: container2.Type, - Properties: &armstorage.ContainerProperties{ - PublicAccess: container2.ContainerProperties.PublicAccess, - }, - Etag: container2.Etag, + Etag: container1.Etag, + }, + { + ID: container2.ID, + Name: container2.Name, + Type: container2.Type, + Properties: &armstorage.ContainerProperties{ + PublicAccess: container2.ContainerProperties.PublicAccess, }, + Etag: container2.Etag, }, }, }, @@ -317,17 +315,15 @@ func TestStorageBlobContainer(t *testing.T) { mockPager := &mockBlobContainersPager{ pages: []armstorage.BlobContainersClientListResponse{ { - ListContainerItems: armstorage.ListContainerItems{ - Value: []*armstorage.ListContainerItem{ - { - // Container with nil name should be skipped - Name: nil, - }, - { - ID: new("/subscriptions/test-subscription/resourceGroups/test-rg/providers/Microsoft.Storage/storageAccounts/teststorageaccount/blobServices/default/containers/valid-container"), - Name: new("valid-container"), - Type: new("Microsoft.Storage/storageAccounts/blobServices/containers"), - }, + Value: []*armstorage.ListContainerItem{ + { + // Container with nil name should be skipped + Name: nil, + }, + { + ID: new("/subscriptions/test-subscription/resourceGroups/test-rg/providers/Microsoft.Storage/storageAccounts/teststorageaccount/blobServices/default/containers/valid-container"), + Name: new("valid-container"), + Type: new("Microsoft.Storage/storageAccounts/blobServices/containers"), }, }, }, diff --git a/sources/azure/manual/storage-encryption-scope_test.go b/sources/azure/manual/storage-encryption-scope_test.go index 581cb0e2..6d7056a7 100644 --- a/sources/azure/manual/storage-encryption-scope_test.go +++ b/sources/azure/manual/storage-encryption-scope_test.go @@ -146,9 +146,7 @@ func TestStorageEncryptionScope(t *testing.T) { mockPager := &mockEncryptionScopesPager{ pages: []armstorage.EncryptionScopesClientListResponse{ { - EncryptionScopeListResult: armstorage.EncryptionScopeListResult{ - Value: []*armstorage.EncryptionScope{scope1, scope2}, - }, + Value: []*armstorage.EncryptionScope{scope1, scope2}, }, }, } @@ -203,11 +201,9 @@ func TestStorageEncryptionScope(t *testing.T) { mockPager := &mockEncryptionScopesPager{ pages: []armstorage.EncryptionScopesClientListResponse{ { - EncryptionScopeListResult: armstorage.EncryptionScopeListResult{ - Value: []*armstorage.EncryptionScope{ - {Name: nil}, - validScope, - }, + Value: []*armstorage.EncryptionScope{ + {Name: nil}, + validScope, }, }, }, diff --git a/sources/azure/manual/storage-fileshare_test.go b/sources/azure/manual/storage-fileshare_test.go index ad51cba4..4397aa88 100644 --- a/sources/azure/manual/storage-fileshare_test.go +++ b/sources/azure/manual/storage-fileshare_test.go @@ -152,28 +152,26 @@ func TestStorageFileShare(t *testing.T) { mockPager := &mockFileSharesPager{ pages: []armstorage.FileSharesClientListResponse{ { - FileShareItems: armstorage.FileShareItems{ - Value: []*armstorage.FileShareItem{ - { - ID: share1.ID, - Name: share1.Name, - Type: share1.Type, - Properties: &armstorage.FileShareProperties{ - AccessTier: share1.FileShareProperties.AccessTier, - ShareQuota: share1.FileShareProperties.ShareQuota, - }, - Etag: share1.Etag, + Value: []*armstorage.FileShareItem{ + { + ID: share1.ID, + Name: share1.Name, + Type: share1.Type, + Properties: &armstorage.FileShareProperties{ + AccessTier: share1.FileShareProperties.AccessTier, + ShareQuota: share1.FileShareProperties.ShareQuota, }, - { - ID: share2.ID, - Name: share2.Name, - Type: share2.Type, - Properties: &armstorage.FileShareProperties{ - AccessTier: share2.FileShareProperties.AccessTier, - ShareQuota: share2.FileShareProperties.ShareQuota, - }, - Etag: share2.Etag, + Etag: share1.Etag, + }, + { + ID: share2.ID, + Name: share2.Name, + Type: share2.Type, + Properties: &armstorage.FileShareProperties{ + AccessTier: share2.FileShareProperties.AccessTier, + ShareQuota: share2.FileShareProperties.ShareQuota, }, + Etag: share2.Etag, }, }, }, @@ -233,17 +231,15 @@ func TestStorageFileShare(t *testing.T) { mockPager := &mockFileSharesPager{ pages: []armstorage.FileSharesClientListResponse{ { - FileShareItems: armstorage.FileShareItems{ - Value: []*armstorage.FileShareItem{ - { - // Share with nil name should be skipped - Name: nil, - }, - { - ID: new("/subscriptions/test-subscription/resourceGroups/test-rg/providers/Microsoft.Storage/storageAccounts/teststorageaccount/fileServices/default/shares/valid-share"), - Name: new("valid-share"), - Type: new("Microsoft.Storage/storageAccounts/fileServices/shares"), - }, + Value: []*armstorage.FileShareItem{ + { + // Share with nil name should be skipped + Name: nil, + }, + { + ID: new("/subscriptions/test-subscription/resourceGroups/test-rg/providers/Microsoft.Storage/storageAccounts/teststorageaccount/fileServices/default/shares/valid-share"), + Name: new("valid-share"), + Type: new("Microsoft.Storage/storageAccounts/fileServices/shares"), }, }, }, diff --git a/sources/azure/manual/storage-private-endpoint-connection_test.go b/sources/azure/manual/storage-private-endpoint-connection_test.go index 9820badc..bebbd188 100644 --- a/sources/azure/manual/storage-private-endpoint-connection_test.go +++ b/sources/azure/manual/storage-private-endpoint-connection_test.go @@ -176,9 +176,7 @@ func TestStoragePrivateEndpointConnection(t *testing.T) { mockPager := &mockPrivateEndpointConnectionsPager{ pages: []armstorage.PrivateEndpointConnectionsClientListResponse{ { - PrivateEndpointConnectionListResult: armstorage.PrivateEndpointConnectionListResult{ - Value: []*armstorage.PrivateEndpointConnection{conn1, conn2}, - }, + Value: []*armstorage.PrivateEndpointConnection{conn1, conn2}, }, }, } @@ -222,11 +220,9 @@ func TestStoragePrivateEndpointConnection(t *testing.T) { mockPager := &mockPrivateEndpointConnectionsPager{ pages: []armstorage.PrivateEndpointConnectionsClientListResponse{ { - PrivateEndpointConnectionListResult: armstorage.PrivateEndpointConnectionListResult{ - Value: []*armstorage.PrivateEndpointConnection{ - {Name: nil}, - validConn, - }, + Value: []*armstorage.PrivateEndpointConnection{ + {Name: nil}, + validConn, }, }, }, diff --git a/sources/azure/manual/storage-queues_test.go b/sources/azure/manual/storage-queues_test.go index a8f78ad9..d89a94b5 100644 --- a/sources/azure/manual/storage-queues_test.go +++ b/sources/azure/manual/storage-queues_test.go @@ -153,23 +153,21 @@ func TestStorageQueues(t *testing.T) { mockPager := &mockQueuesPager{ pages: []armstorage.QueueClientListResponse{ { - ListQueueResource: armstorage.ListQueueResource{ - Value: []*armstorage.ListQueue{ - { - ID: queue1.ID, - Name: queue1.Name, - Type: queue1.Type, - QueueProperties: &armstorage.ListQueueProperties{ - Metadata: queue1.QueueProperties.Metadata, - }, + Value: []*armstorage.ListQueue{ + { + ID: queue1.ID, + Name: queue1.Name, + Type: queue1.Type, + QueueProperties: &armstorage.ListQueueProperties{ + Metadata: queue1.QueueProperties.Metadata, }, - { - ID: queue2.ID, - Name: queue2.Name, - Type: queue2.Type, - QueueProperties: &armstorage.ListQueueProperties{ - Metadata: queue2.QueueProperties.Metadata, - }, + }, + { + ID: queue2.ID, + Name: queue2.Name, + Type: queue2.Type, + QueueProperties: &armstorage.ListQueueProperties{ + Metadata: queue2.QueueProperties.Metadata, }, }, }, @@ -231,19 +229,17 @@ func TestStorageQueues(t *testing.T) { mockPager := &mockQueuesPager{ pages: []armstorage.QueueClientListResponse{ { - ListQueueResource: armstorage.ListQueueResource{ - Value: []*armstorage.ListQueue{ - { - // Queue with nil name should be skipped - Name: nil, - }, - { - ID: validQueue.ID, - Name: validQueue.Name, - Type: validQueue.Type, - QueueProperties: &armstorage.ListQueueProperties{ - Metadata: validQueue.QueueProperties.Metadata, - }, + Value: []*armstorage.ListQueue{ + { + // Queue with nil name should be skipped + Name: nil, + }, + { + ID: validQueue.ID, + Name: validQueue.Name, + Type: validQueue.Type, + QueueProperties: &armstorage.ListQueueProperties{ + Metadata: validQueue.QueueProperties.Metadata, }, }, }, diff --git a/sources/azure/manual/storage-table_test.go b/sources/azure/manual/storage-table_test.go index 50c30d95..2ee2bbdc 100644 --- a/sources/azure/manual/storage-table_test.go +++ b/sources/azure/manual/storage-table_test.go @@ -154,20 +154,18 @@ func TestStorageTables(t *testing.T) { mockPager := &mockTablesPager{ pages: []armstorage.TableClientListResponse{ { - ListTableResource: armstorage.ListTableResource{ - Value: []*armstorage.Table{ - { - ID: table1.ID, - Name: table1.Name, - Type: table1.Type, - TableProperties: table1.TableProperties, - }, - { - ID: table2.ID, - Name: table2.Name, - Type: table2.Type, - TableProperties: table2.TableProperties, - }, + Value: []*armstorage.Table{ + { + ID: table1.ID, + Name: table1.Name, + Type: table1.Type, + TableProperties: table1.TableProperties, + }, + { + ID: table2.ID, + Name: table2.Name, + Type: table2.Type, + TableProperties: table2.TableProperties, }, }, }, @@ -228,18 +226,16 @@ func TestStorageTables(t *testing.T) { mockPager := &mockTablesPager{ pages: []armstorage.TableClientListResponse{ { - ListTableResource: armstorage.ListTableResource{ - Value: []*armstorage.Table{ - { - // Table with nil name should be skipped - Name: nil, - }, - { - ID: validTable.ID, - Name: validTable.Name, - Type: validTable.Type, - TableProperties: validTable.TableProperties, - }, + Value: []*armstorage.Table{ + { + // Table with nil name should be skipped + Name: nil, + }, + { + ID: validTable.ID, + Name: validTable.Name, + Type: validTable.Type, + TableProperties: validTable.TableProperties, }, }, }, diff --git a/sources/azure/shared/base.go b/sources/azure/shared/base.go index 40e9605e..9813d8ac 100644 --- a/sources/azure/shared/base.go +++ b/sources/azure/shared/base.go @@ -26,10 +26,8 @@ func NewResourceGroupBase( item shared.ItemType, ) *ResourceGroupBase { base := &ResourceGroupBase{ - AzureBase: AzureBase{ - subscriptionID: subscriptionID, - }, - resourceGroup: resourceGroup, + subscriptionID: subscriptionID, + resourceGroup: resourceGroup, } base.Base = shared.NewBase( category, @@ -92,9 +90,7 @@ func NewSubscriptionBase( item shared.ItemType, ) *SubscriptionBase { base := &SubscriptionBase{ - AzureBase: AzureBase{ - subscriptionID: subscriptionID, - }, + subscriptionID: subscriptionID, } base.Base = shared.NewBase( category, diff --git a/sources/azure/shared/mocks/mock_application_gateways_client.go b/sources/azure/shared/mocks/mock_application_gateways_client.go index 2962bef8..3877b999 100644 --- a/sources/azure/shared/mocks/mock_application_gateways_client.go +++ b/sources/azure/shared/mocks/mock_application_gateways_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_application_security_groups_client.go b/sources/azure/shared/mocks/mock_application_security_groups_client.go index 0df8c08d..23401e17 100644 --- a/sources/azure/shared/mocks/mock_application_security_groups_client.go +++ b/sources/azure/shared/mocks/mock_application_security_groups_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_ddos_protection_plans_client.go b/sources/azure/shared/mocks/mock_ddos_protection_plans_client.go index d46a8425..5215f344 100644 --- a/sources/azure/shared/mocks/mock_ddos_protection_plans_client.go +++ b/sources/azure/shared/mocks/mock_ddos_protection_plans_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_default_security_rules_client.go b/sources/azure/shared/mocks/mock_default_security_rules_client.go index e1f5088e..b15834d3 100644 --- a/sources/azure/shared/mocks/mock_default_security_rules_client.go +++ b/sources/azure/shared/mocks/mock_default_security_rules_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_documentdb_database_accounts_client.go b/sources/azure/shared/mocks/mock_documentdb_database_accounts_client.go index 3da33d1e..51fa10c0 100644 --- a/sources/azure/shared/mocks/mock_documentdb_database_accounts_client.go +++ b/sources/azure/shared/mocks/mock_documentdb_database_accounts_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + armcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_documentdb_private_endpoint_connection_client.go b/sources/azure/shared/mocks/mock_documentdb_private_endpoint_connection_client.go index dd7d9c69..83f09214 100644 --- a/sources/azure/shared/mocks/mock_documentdb_private_endpoint_connection_client.go +++ b/sources/azure/shared/mocks/mock_documentdb_private_endpoint_connection_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v3" + armcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v4" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_flow_logs_client.go b/sources/azure/shared/mocks/mock_flow_logs_client.go index 2e0d0066..c33b263e 100644 --- a/sources/azure/shared/mocks/mock_flow_logs_client.go +++ b/sources/azure/shared/mocks/mock_flow_logs_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_interface_ip_configurations_client.go b/sources/azure/shared/mocks/mock_interface_ip_configurations_client.go index cfdf8205..2a0c8d84 100644 --- a/sources/azure/shared/mocks/mock_interface_ip_configurations_client.go +++ b/sources/azure/shared/mocks/mock_interface_ip_configurations_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_ip_groups_client.go b/sources/azure/shared/mocks/mock_ip_groups_client.go index 034ea5fb..e84831d0 100644 --- a/sources/azure/shared/mocks/mock_ip_groups_client.go +++ b/sources/azure/shared/mocks/mock_ip_groups_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_load_balancer_backend_address_pools_client.go b/sources/azure/shared/mocks/mock_load_balancer_backend_address_pools_client.go index 9fe8e3a9..15d84e98 100644 --- a/sources/azure/shared/mocks/mock_load_balancer_backend_address_pools_client.go +++ b/sources/azure/shared/mocks/mock_load_balancer_backend_address_pools_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_load_balancer_frontend_ip_configurations_client.go b/sources/azure/shared/mocks/mock_load_balancer_frontend_ip_configurations_client.go index c1c1c6ac..068c74d1 100644 --- a/sources/azure/shared/mocks/mock_load_balancer_frontend_ip_configurations_client.go +++ b/sources/azure/shared/mocks/mock_load_balancer_frontend_ip_configurations_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_load_balancer_probes_client.go b/sources/azure/shared/mocks/mock_load_balancer_probes_client.go index 1690a359..223ed4b7 100644 --- a/sources/azure/shared/mocks/mock_load_balancer_probes_client.go +++ b/sources/azure/shared/mocks/mock_load_balancer_probes_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_load_balancers_client.go b/sources/azure/shared/mocks/mock_load_balancers_client.go index f8ef7a0b..61a56b1f 100644 --- a/sources/azure/shared/mocks/mock_load_balancers_client.go +++ b/sources/azure/shared/mocks/mock_load_balancers_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_local_network_gateways_client.go b/sources/azure/shared/mocks/mock_local_network_gateways_client.go index ad625817..f6d0627d 100644 --- a/sources/azure/shared/mocks/mock_local_network_gateways_client.go +++ b/sources/azure/shared/mocks/mock_local_network_gateways_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_nat_gateways_client.go b/sources/azure/shared/mocks/mock_nat_gateways_client.go index 2c53c0e2..789016a3 100644 --- a/sources/azure/shared/mocks/mock_nat_gateways_client.go +++ b/sources/azure/shared/mocks/mock_nat_gateways_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_network_interfaces_client.go b/sources/azure/shared/mocks/mock_network_interfaces_client.go index 29b5bd06..3c65ccee 100644 --- a/sources/azure/shared/mocks/mock_network_interfaces_client.go +++ b/sources/azure/shared/mocks/mock_network_interfaces_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_network_private_endpoint_client.go b/sources/azure/shared/mocks/mock_network_private_endpoint_client.go index d933e981..6aa5d4e4 100644 --- a/sources/azure/shared/mocks/mock_network_private_endpoint_client.go +++ b/sources/azure/shared/mocks/mock_network_private_endpoint_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_network_security_groups_client.go b/sources/azure/shared/mocks/mock_network_security_groups_client.go index 7a61fc33..0af1864f 100644 --- a/sources/azure/shared/mocks/mock_network_security_groups_client.go +++ b/sources/azure/shared/mocks/mock_network_security_groups_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_network_watchers_client.go b/sources/azure/shared/mocks/mock_network_watchers_client.go index cdc8a973..99ce4634 100644 --- a/sources/azure/shared/mocks/mock_network_watchers_client.go +++ b/sources/azure/shared/mocks/mock_network_watchers_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_private_link_services_client.go b/sources/azure/shared/mocks/mock_private_link_services_client.go index c3775bd3..5437495d 100644 --- a/sources/azure/shared/mocks/mock_private_link_services_client.go +++ b/sources/azure/shared/mocks/mock_private_link_services_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_public_ip_addresses_client.go b/sources/azure/shared/mocks/mock_public_ip_addresses_client.go index 7e382e67..77244700 100644 --- a/sources/azure/shared/mocks/mock_public_ip_addresses_client.go +++ b/sources/azure/shared/mocks/mock_public_ip_addresses_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_public_ip_prefixes_client.go b/sources/azure/shared/mocks/mock_public_ip_prefixes_client.go index 4ee32b09..a4aaf2d7 100644 --- a/sources/azure/shared/mocks/mock_public_ip_prefixes_client.go +++ b/sources/azure/shared/mocks/mock_public_ip_prefixes_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_route_tables_client.go b/sources/azure/shared/mocks/mock_route_tables_client.go index 954fd65b..34b7bf35 100644 --- a/sources/azure/shared/mocks/mock_route_tables_client.go +++ b/sources/azure/shared/mocks/mock_route_tables_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_routes_client.go b/sources/azure/shared/mocks/mock_routes_client.go index fd6f67bb..179036ad 100644 --- a/sources/azure/shared/mocks/mock_routes_client.go +++ b/sources/azure/shared/mocks/mock_routes_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_security_rules_client.go b/sources/azure/shared/mocks/mock_security_rules_client.go index 1078baa3..c1f4f32c 100644 --- a/sources/azure/shared/mocks/mock_security_rules_client.go +++ b/sources/azure/shared/mocks/mock_security_rules_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_subnets_client.go b/sources/azure/shared/mocks/mock_subnets_client.go index 91455aad..1c569b56 100644 --- a/sources/azure/shared/mocks/mock_subnets_client.go +++ b/sources/azure/shared/mocks/mock_subnets_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_virtual_network_gateway_connections_client.go b/sources/azure/shared/mocks/mock_virtual_network_gateway_connections_client.go index e5b10475..01d7102b 100644 --- a/sources/azure/shared/mocks/mock_virtual_network_gateway_connections_client.go +++ b/sources/azure/shared/mocks/mock_virtual_network_gateway_connections_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_virtual_network_gateways_client.go b/sources/azure/shared/mocks/mock_virtual_network_gateways_client.go index 4d9a99ef..3bca54f4 100644 --- a/sources/azure/shared/mocks/mock_virtual_network_gateways_client.go +++ b/sources/azure/shared/mocks/mock_virtual_network_gateways_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_virtual_network_peerings_client.go b/sources/azure/shared/mocks/mock_virtual_network_peerings_client.go index 8498857b..fca06b9e 100644 --- a/sources/azure/shared/mocks/mock_virtual_network_peerings_client.go +++ b/sources/azure/shared/mocks/mock_virtual_network_peerings_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/azure/shared/mocks/mock_virtual_networks_client.go b/sources/azure/shared/mocks/mock_virtual_networks_client.go index 85a33e04..ac47cb19 100644 --- a/sources/azure/shared/mocks/mock_virtual_networks_client.go +++ b/sources/azure/shared/mocks/mock_virtual_networks_client.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v9" + armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v11" clients "github.com/overmindtech/cli/sources/azure/clients" gomock "go.uber.org/mock/gomock" ) diff --git a/sources/gcp/build/package/Dockerfile b/sources/gcp/build/package/Dockerfile index 195a390c..9e3b2893 100644 --- a/sources/gcp/build/package/Dockerfile +++ b/sources/gcp/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION diff --git a/sources/gcp/dynamic/adapter-listable.go b/sources/gcp/dynamic/adapter-listable.go index 7ad9582a..c871fd35 100644 --- a/sources/gcp/dynamic/adapter-listable.go +++ b/sources/gcp/dynamic/adapter-listable.go @@ -24,23 +24,21 @@ type ListableAdapter struct { // NewListableAdapter creates a new GCP dynamic adapter. func NewListableAdapter(listEndpointFunc gcpshared.ListEndpointFunc, config *AdapterConfig, cache sdpcache.Cache) discovery.ListableAdapter { return ListableAdapter{ - listEndpointFunc: listEndpointFunc, - listFilterFunc: config.ListFilterFunc, - Adapter: Adapter{ - locations: config.Locations, - httpCli: config.HTTPClient, - cache: cache, - getURLFunc: config.GetURLFunc, - sdpAssetType: config.SDPAssetType, - sdpAdapterCategory: config.SDPAdapterCategory, - terraformMappings: config.TerraformMappings, - linker: config.Linker, - potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), - uniqueAttributeKeys: config.UniqueAttributeKeys, - iamPermissions: config.IAMPermissions, - nameSelector: config.NameSelector, - listResponseSelector: config.ListResponseSelector, - }, + listEndpointFunc: listEndpointFunc, + listFilterFunc: config.ListFilterFunc, + locations: config.Locations, + httpCli: config.HTTPClient, + cache: cache, + getURLFunc: config.GetURLFunc, + sdpAssetType: config.SDPAssetType, + sdpAdapterCategory: config.SDPAdapterCategory, + terraformMappings: config.TerraformMappings, + linker: config.Linker, + potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), + uniqueAttributeKeys: config.UniqueAttributeKeys, + iamPermissions: config.IAMPermissions, + nameSelector: config.NameSelector, + listResponseSelector: config.ListResponseSelector, } } diff --git a/sources/gcp/dynamic/adapter-searchable-listable.go b/sources/gcp/dynamic/adapter-searchable-listable.go index 7ddd4d93..991fbb3b 100644 --- a/sources/gcp/dynamic/adapter-searchable-listable.go +++ b/sources/gcp/dynamic/adapter-searchable-listable.go @@ -34,25 +34,21 @@ func NewSearchableListableAdapter(searchURLFunc gcpshared.EndpointFunc, listEndp customSearchMethodDescription: customSearchMethodDesc, searchEndpointFunc: searchURLFunc, searchFilterFunc: config.SearchFilterFunc, - ListableAdapter: ListableAdapter{ - listEndpointFunc: listEndpointFunc, - listFilterFunc: config.ListFilterFunc, - Adapter: Adapter{ - locations: config.Locations, - httpCli: config.HTTPClient, - cache: cache, - getURLFunc: config.GetURLFunc, - sdpAssetType: config.SDPAssetType, - sdpAdapterCategory: config.SDPAdapterCategory, - terraformMappings: config.TerraformMappings, - linker: config.Linker, - potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), - uniqueAttributeKeys: config.UniqueAttributeKeys, - iamPermissions: config.IAMPermissions, - nameSelector: config.NameSelector, - listResponseSelector: config.ListResponseSelector, - }, - }, + listEndpointFunc: listEndpointFunc, + listFilterFunc: config.ListFilterFunc, + locations: config.Locations, + httpCli: config.HTTPClient, + cache: cache, + getURLFunc: config.GetURLFunc, + sdpAssetType: config.SDPAssetType, + sdpAdapterCategory: config.SDPAdapterCategory, + terraformMappings: config.TerraformMappings, + linker: config.Linker, + potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), + uniqueAttributeKeys: config.UniqueAttributeKeys, + iamPermissions: config.IAMPermissions, + nameSelector: config.NameSelector, + listResponseSelector: config.ListResponseSelector, } } diff --git a/sources/gcp/dynamic/adapter-searchable.go b/sources/gcp/dynamic/adapter-searchable.go index e94b1bf5..9a574ffc 100644 --- a/sources/gcp/dynamic/adapter-searchable.go +++ b/sources/gcp/dynamic/adapter-searchable.go @@ -28,21 +28,19 @@ func NewSearchableAdapter(searchEndpointFunc gcpshared.EndpointFunc, config *Ada customSearchMethodDesc: customSearchMethodDesc, searchEndpointFunc: searchEndpointFunc, - Adapter: Adapter{ - locations: config.Locations, - httpCli: config.HTTPClient, - cache: cache, - getURLFunc: config.GetURLFunc, - sdpAssetType: config.SDPAssetType, - sdpAdapterCategory: config.SDPAdapterCategory, - terraformMappings: config.TerraformMappings, - linker: config.Linker, - potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), - uniqueAttributeKeys: config.UniqueAttributeKeys, - iamPermissions: config.IAMPermissions, - nameSelector: config.NameSelector, - listResponseSelector: config.ListResponseSelector, - }, + locations: config.Locations, + httpCli: config.HTTPClient, + cache: cache, + getURLFunc: config.GetURLFunc, + sdpAssetType: config.SDPAssetType, + sdpAdapterCategory: config.SDPAdapterCategory, + terraformMappings: config.TerraformMappings, + linker: config.Linker, + potentialLinks: potentialLinksFromLinkRules(config.SDPAssetType, gcpshared.LinkRules), + uniqueAttributeKeys: config.UniqueAttributeKeys, + iamPermissions: config.IAMPermissions, + nameSelector: config.NameSelector, + listResponseSelector: config.ListResponseSelector, } } diff --git a/sources/gcp/integration-tests/service-account-impersonation_test.go b/sources/gcp/integration-tests/service-account-impersonation_test.go index dec678cf..f83fec4a 100644 --- a/sources/gcp/integration-tests/service-account-impersonation_test.go +++ b/sources/gcp/integration-tests/service-account-impersonation_test.go @@ -308,8 +308,7 @@ func testOurServiceAccountDirectAuth(t *testing.T, ctx context.Context, state *t } // Check if it's a permission error - var apiErr *apierror.APIError - if errors.As(err, &apiErr) { + if apiErr, ok := errors.AsType[*apierror.APIError](err); ok { if apiErr.HTTPCode() == http.StatusForbidden || apiErr.GRPCStatus().Code().String() == "PermissionDenied" { t.Logf("✓ Correctly received permission denied error: %v", err) return @@ -319,8 +318,7 @@ func testOurServiceAccountDirectAuth(t *testing.T, ctx context.Context, state *t } // Also check for googleapi.Error - var gErr *googleapi.Error - if errors.As(err, &gErr) { + if gErr, ok := errors.AsType[*googleapi.Error](err); ok { if gErr.Code == http.StatusForbidden { t.Logf("✓ Correctly received permission denied error: %v", err) return diff --git a/sources/gcp/proc/proc.go b/sources/gcp/proc/proc.go index d07766f4..d4ec1ccd 100644 --- a/sources/gcp/proc/proc.go +++ b/sources/gcp/proc/proc.go @@ -153,8 +153,7 @@ func (c *ProjectHealthChecker) runCheck(ctx context.Context) (*ProjectPermission prj, err := c.adapter.Get(ctx, *projectID, *projectID, false) if err != nil { // Check if this is a permission error and provide a simplified message - var permissionError *dynamic.PermissionError - if errors.As(err, &permissionError) { + if _, ok := errors.AsType[*dynamic.PermissionError](err); ok { err = fmt.Errorf("insufficient permissions to access GCP project '%s'. "+ "Please ensure the service account has the 'resourcemanager.projects.get' permission via the 'roles/browser' predefined GCP role", *projectID) } else { diff --git a/sources/gcp/shared/base.go b/sources/gcp/shared/base.go index e15f2037..49341025 100644 --- a/sources/gcp/shared/base.go +++ b/sources/gcp/shared/base.go @@ -28,8 +28,7 @@ func CollectFromStream( errs := stream.GetErrors() if len(errs) > 0 { // Return first error (preserving existing behavior) - var qErr *sdp.QueryError - if errors.As(errs[0], &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](errs[0]); ok { return nil, qErr } return nil, &sdp.QueryError{ diff --git a/sources/gcp/shared/utils.go b/sources/gcp/shared/utils.go index cdfbd5db..42dbd280 100644 --- a/sources/gcp/shared/utils.go +++ b/sources/gcp/shared/utils.go @@ -3,6 +3,7 @@ package shared import ( "context" "fmt" + "slices" "strings" "go.opentelemetry.io/otel/attribute" @@ -39,9 +40,9 @@ func LastPathComponent(url string) string { return "" } parts := strings.Split(url, "/") - for i := len(parts) - 1; i >= 0; i-- { - if parts[i] != "" { - return parts[i] + for _, part := range slices.Backward(parts) { + if part != "" { + return part } } return "" diff --git a/sources/snapshot/build/package/Dockerfile b/sources/snapshot/build/package/Dockerfile index eabef2ed..bc43bca2 100644 --- a/sources/snapshot/build/package/Dockerfile +++ b/sources/snapshot/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION diff --git a/sources/transformer.go b/sources/transformer.go index 1e00c1ad..aa07c130 100644 --- a/sources/transformer.go +++ b/sources/transformer.go @@ -95,9 +95,8 @@ func WrapperToAdapter(wrapper Wrapper, cache sdpcache.Cache) StandardAdapter { core := standardAdapterCore{ wrapper: wrapper, cache: cache, - } - core.sourceType = "unknown" + sourceType: "unknown"} it, ok := wrapper.ItemType().(shared.ItemTypeInstance) if ok { @@ -259,8 +258,7 @@ func (s *standardAdapterCore) validateScopes(scope string) error { // // IsNotFound returns true if err is a QueryError with ErrorType NOTFOUND. func IsNotFound(err error) bool { - var qe *sdp.QueryError - if errors.As(err, &qe) { + if qe, ok := errors.AsType[*sdp.QueryError](err); ok { return qe.GetErrorType() == sdp.QueryError_NOTFOUND } return false diff --git a/stdlib-source/adapters/dns.go b/stdlib-source/adapters/dns.go index d5c7dbeb..9f09e3d5 100644 --- a/stdlib-source/adapters/dns.go +++ b/stdlib-source/adapters/dns.go @@ -7,9 +7,10 @@ import ( "net" "sort" "strings" + "syscall" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v7" "github.com/miekg/dns" "github.com/overmindtech/cli/go/sdp-go" "github.com/overmindtech/cli/go/sdpcache" @@ -298,7 +299,32 @@ func (d *DNSAdapter) Search(ctx context.Context, scope string, query string, ign return items, nil } -// retryDNSQuery handles retrying DNS queries with backoff and server rotation +// isImmediateUnreachable reports nameserver transport failures that mean this +// server cannot be reached. These should fail over to the next configured +// server once, rather than being treated as a permanent query failure or +// retried for the full backoff budget (the Depot/CI case: UDP/53 to VPC DNS +// returns ECONNREFUSED). +func isImmediateUnreachable(err error) bool { + return errors.Is(err, syscall.ECONNREFUSED) || + errors.Is(err, syscall.ENETUNREACH) || + errors.Is(err, syscall.EHOSTUNREACH) +} + +// isRetryableTimeout reports query timeouts that may still succeed on another +// nameserver or a later attempt within the backoff budget. +func isRetryableTimeout(err error) bool { + if errors.Is(err, context.DeadlineExceeded) { + return true + } + var ne net.Error + return errors.As(err, &ne) && ne.Timeout() +} + +// retryDNSQuery handles retrying DNS queries with backoff and server rotation. +// Immediate unreachability (connection refused / host or network unreachable) +// walks the configured server list once and returns the last error. Timeouts +// may backoff and rotate within MaxElapsedTime. DNS responses including +// NOTFOUND, and other application errors, are permanent and do not rotate. func (d *DNSAdapter) retryDNSQuery(ctx context.Context, queryFn func(context.Context, string) ([]*sdp.Item, error)) ([]*sdp.Item, error) { b := backoff.NewExponentialBackOff() b.InitialInterval = 100 * time.Millisecond @@ -307,31 +333,44 @@ func (d *DNSAdapter) retryDNSQuery(ctx context.Context, queryFn func(context.Con var items []*sdp.Item var i int var server string + var lastUnreachable error operation := func() (any, error) { - if i >= len(d.GetServers()) { - i = 0 - } - - ctx, cancel := context.WithTimeout(ctx, 3*time.Second) - defer cancel() + servers := d.GetServers() + n := len(servers) - server = d.GetServers()[i] + for range n { + if err := ctx.Err(); err != nil { + return nil, err + } + if i >= n { + i = 0 + } - var err error - items, err = queryFn(ctx, server) - if err != nil { - i++ // Move to next server on error + attemptCtx, cancel := context.WithTimeout(ctx, 3*time.Second) + server = servers[i] + var err error + items, err = queryFn(attemptCtx, server) + cancel() + if err == nil { + return nil, nil + } - if errors.Is(err, context.DeadlineExceeded) || - strings.Contains(err.Error(), "timeout") || - strings.Contains(err.Error(), "temporary failure") { - return nil, err // Retry on timeout + if isImmediateUnreachable(err) { + lastUnreachable = err + i++ + continue + } + if isRetryableTimeout(err) { + i++ + return nil, err } + // DNS response (including NOTFOUND) or other application error: + // do not rotate to the next nameserver. return nil, backoff.Permanent(err) } - return nil, nil + return nil, backoff.Permanent(lastUnreachable) } _, err := backoff.Retry(ctx, operation, @@ -343,6 +382,9 @@ func (d *DNSAdapter) retryDNSQuery(ctx context.Context, queryFn func(context.Con attribute.String("ovm.dns.server", server), ) if err != nil { + if re := backoff.AsRetryError(err); re != nil && errors.Is(re.Cause, backoff.ErrPermanent) { + return nil, re.LastErr + } return nil, err } @@ -378,10 +420,8 @@ func (d *DNSAdapter) makeReverseQueryImpl(ctx context.Context, query string, ser Qtype: dns.TypePTR, }, }, - MsgHdr: dns.MsgHdr{ - Opcode: dns.OpcodeQuery, - RecursionDesired: true, - }, + Opcode: dns.OpcodeQuery, + RecursionDesired: true, } r, _, err := d.client.ExchangeContext(ctx, &msg, server) @@ -424,10 +464,8 @@ func (d *DNSAdapter) makeQueryImpl(ctx context.Context, query string, server str Qtype: dns.TypeA, }, }, - MsgHdr: dns.MsgHdr{ - Opcode: dns.OpcodeQuery, - RecursionDesired: true, - }, + Opcode: dns.OpcodeQuery, + RecursionDesired: true, } r, _, err := d.client.ExchangeContext(ctx, &msg, server) diff --git a/stdlib-source/adapters/dns_test.go b/stdlib-source/adapters/dns_test.go index c4fe1bea..09b152c1 100644 --- a/stdlib-source/adapters/dns_test.go +++ b/stdlib-source/adapters/dns_test.go @@ -3,7 +3,9 @@ package adapters import ( "context" "errors" + "fmt" "net" + "syscall" "testing" "time" @@ -146,7 +148,9 @@ func TestDnsGet(t *testing.T) { // point running this test dialer := &net.Dialer{} conn, err = dialer.DialContext(t.Context(), "tcp", "one.one.one.one:443") - conn.Close() + if conn != nil { + _ = conn.Close() + } if err != nil { t.Skip("No internet connection detected") @@ -173,8 +177,7 @@ func TestDnsGet(t *testing.T) { t.Error("expected error but got nil") } - var e *sdp.QueryError - if !errors.As(err, &e) { + if _, ok := errors.AsType[*sdp.QueryError](err); !ok { t.Errorf("expected error type to be *sdp.QueryError, got %T", err) } }) @@ -232,8 +235,7 @@ func TestDnsGet(t *testing.T) { t.Error("expected error but got nil") } - var e *sdp.QueryError - if !errors.As(err, &e) { + if _, ok := errors.AsType[*sdp.QueryError](err); !ok { t.Errorf("expected error type to be *sdp.QueryError, got %T", err) } }) @@ -375,3 +377,223 @@ func TestTimeoutShorterThanCaller(t *testing.T) { t.Errorf("expected context.DeadlineExceeded error, got: %v", err) } } + +type timeoutNetError struct{} + +func (timeoutNetError) Error() string { return "i/o timeout" } +func (timeoutNetError) Timeout() bool { return true } +func (timeoutNetError) Temporary() bool { return true } + +func wrapSyscall(err error) error { + return fmt.Errorf("read udp 169.254.169.253:53: %w", &net.OpError{ + Op: "read", + Net: "udp", + Err: err, + }) +} + +func TestRetryDNSQueryTransportFailover(t *testing.T) { + t.Parallel() + + success := []*sdp.Item{{Type: ItemType, UniqueAttribute: UniqueAttribute, Scope: "global"}} + servers := []string{"169.254.169.253:53", "1.1.1.1:53"} + + unreachableErrs := []struct { + name string + err error + }{ + {"ECONNREFUSED", syscall.ECONNREFUSED}, + {"ENETUNREACH", syscall.ENETUNREACH}, + {"EHOSTUNREACH", syscall.EHOSTUNREACH}, + } + + for _, tc := range unreachableErrs { + t.Run("first server "+tc.name+" then second succeeds", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: servers, + } + var attempted []string + items, err := d.retryDNSQuery(t.Context(), func(_ context.Context, server string) ([]*sdp.Item, error) { + attempted = append(attempted, server) + if server == servers[0] { + return nil, wrapSyscall(tc.err) + } + return success, nil + }) + if err != nil { + t.Fatalf("expected success after failover, got error: %v", err) + } + if len(items) != 1 { + t.Errorf("expected 1 item, got %d", len(items)) + } + wantAttempted := []string{servers[0], servers[1]} + if len(attempted) != len(wantAttempted) { + t.Fatalf("expected attempted %v, got %v", wantAttempted, attempted) + } + for i, got := range attempted { + if got != wantAttempted[i] { + t.Errorf("attempted[%d]: expected %q, got %q", i, wantAttempted[i], got) + } + } + }) + } + + t.Run("NOTFOUND from first server does not call second", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: servers, + } + notFound := &sdp.QueryError{ + ErrorType: sdp.QueryError_NOTFOUND, + ErrorString: "no A or AAAA records found", + Scope: "global", + SourceName: d.Name(), + ItemType: d.Type(), + } + var attempted []string + _, err := d.retryDNSQuery(t.Context(), func(_ context.Context, server string) ([]*sdp.Item, error) { + attempted = append(attempted, server) + if server == servers[0] { + return nil, notFound + } + t.Error("second server should not be queried after NOTFOUND") + return success, nil + }) + if err == nil { + t.Fatal("expected NOTFOUND error, got nil") + } + var qe *sdp.QueryError + if !errors.As(err, &qe) || qe.GetErrorType() != sdp.QueryError_NOTFOUND { + t.Errorf("expected NOTFOUND, got %v", err) + } + if len(attempted) != 1 || attempted[0] != servers[0] { + t.Errorf("expected only first server, got %v", attempted) + } + }) + + t.Run("other non-transport errors do not rotate", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: servers, + } + appErr := errors.New("servfail") + var attempted []string + _, err := d.retryDNSQuery(t.Context(), func(_ context.Context, server string) ([]*sdp.Item, error) { + attempted = append(attempted, server) + if server == servers[0] { + return nil, appErr + } + t.Error("second server should not be queried after application error") + return success, nil + }) + if !errors.Is(err, appErr) { + t.Errorf("expected %v, got %v", appErr, err) + } + if len(attempted) != 1 || attempted[0] != servers[0] { + t.Errorf("expected only first server, got %v", attempted) + } + }) + + t.Run("every server refused fails after one pass", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: []string{"10.0.0.1:53", "10.0.0.2:53", "10.0.0.3:53"}, + } + var attempted []string + start := time.Now() + _, err := d.retryDNSQuery(t.Context(), func(_ context.Context, server string) ([]*sdp.Item, error) { + attempted = append(attempted, server) + return nil, wrapSyscall(syscall.ECONNREFUSED) + }) + elapsed := time.Since(start) + if elapsed > 2*time.Second { + t.Errorf("expected one pass to finish quickly, took %v", elapsed) + } + if !errors.Is(err, syscall.ECONNREFUSED) { + t.Errorf("expected last error to be ECONNREFUSED, got %v", err) + } + if len(attempted) != 3 { + t.Errorf("expected 3 attempts (one per server), got %d: %v", len(attempted), attempted) + } + for i, got := range attempted { + if got != d.Servers[i] { + t.Errorf("attempted[%d]: expected %q, got %q", i, d.Servers[i], got) + } + } + }) + + t.Run("caller context cancel returns promptly", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: servers, + } + ctx, cancel := context.WithCancel(t.Context()) + go func() { + time.Sleep(50 * time.Millisecond) + cancel() + }() + start := time.Now() + _, err := d.retryDNSQuery(ctx, func(ctx context.Context, _ string) ([]*sdp.Item, error) { + <-ctx.Done() + return nil, ctx.Err() + }) + elapsed := time.Since(start) + if elapsed > 2*time.Second { + t.Errorf("expected cancel to return promptly, took %v", elapsed) + } + if !errors.Is(err, context.Canceled) { + t.Errorf("expected context.Canceled, got %v", err) + } + }) + + t.Run("timeout on first server rotates to second", func(t *testing.T) { + t.Parallel() + + d := DNSAdapter{ + cache: sdpcache.NewNoOpCache(), + Servers: servers, + } + + timeoutCases := []struct { + name string + err error + }{ + {"DeadlineExceeded", context.DeadlineExceeded}, + {"net.Error Timeout", timeoutNetError{}}, + } + for _, tc := range timeoutCases { + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + + var attempted []string + items, err := d.retryDNSQuery(t.Context(), func(_ context.Context, server string) ([]*sdp.Item, error) { + attempted = append(attempted, server) + if server == servers[0] { + return nil, tc.err + } + return success, nil + }) + if err != nil { + t.Fatalf("expected success after timeout failover, got error: %v", err) + } + if len(items) != 1 { + t.Errorf("expected 1 item, got %d", len(items)) + } + if len(attempted) < 2 || attempted[0] != servers[0] || attempted[1] != servers[1] { + t.Errorf("expected first then second server, got %v", attempted) + } + }) + } + }) +} diff --git a/stdlib-source/adapters/http_test.go b/stdlib-source/adapters/http_test.go index 40bb0660..7eddb132 100644 --- a/stdlib-source/adapters/http_test.go +++ b/stdlib-source/adapters/http_test.go @@ -459,8 +459,7 @@ func TestHTTPGet(t *testing.T) { t.Error("Expected error for link-local IP address, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if qErr.GetErrorType() != sdp.QueryError_OTHER { t.Errorf("expected error type OTHER, got %v", qErr.GetErrorType()) } @@ -499,8 +498,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Errorf("expected error for private IP %s, got nil", u) } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "private") { t.Errorf("expected error for %s to mention 'private', got: %s", u, qErr.GetErrorString()) } @@ -513,8 +511,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for unspecified address 0.0.0.0, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "unspecified") { t.Errorf("expected error to mention 'unspecified', got: %s", qErr.GetErrorString()) } @@ -526,8 +523,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for CGNAT IP, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "carrier-grade NAT") { t.Errorf("expected error to mention 'carrier-grade NAT', got: %s", qErr.GetErrorString()) } @@ -543,8 +539,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for IPv6 loopback, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "loopback") { t.Errorf("expected error to mention 'loopback', got: %s", qErr.GetErrorString()) } @@ -556,8 +551,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for IPv6 ULA, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "private") { t.Errorf("expected error to mention 'private', got: %s", qErr.GetErrorString()) } @@ -603,8 +597,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for IPv6 link-local, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "link-local") { t.Errorf("expected error to mention 'link-local', got: %s", qErr.GetErrorString()) } @@ -616,8 +609,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected error for IPv4-mapped IPv6 private address, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "private") { t.Errorf("expected error to mention 'private', got: %s", qErr.GetErrorString()) } @@ -633,8 +625,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected defaultIPPolicy to block loopback test server, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "loopback") { t.Errorf("expected error to mention 'loopback', got: %s", qErr.GetErrorString()) } @@ -664,8 +655,7 @@ func TestHTTPGet(t *testing.T) { if err == nil { t.Error("expected DNS-rebinding to private IP to be blocked, got nil") } - var qErr *sdp.QueryError - if errors.As(err, &qErr) { + if qErr, ok := errors.AsType[*sdp.QueryError](err); ok { if !strings.Contains(qErr.GetErrorString(), "private") { t.Errorf("expected error to mention 'private', got: %s", qErr.GetErrorString()) } diff --git a/stdlib-source/adapters/test/data.go b/stdlib-source/adapters/test/data.go index 4f736554..1e37e67e 100644 --- a/stdlib-source/adapters/test/data.go +++ b/stdlib-source/adapters/test/data.go @@ -3,10 +3,8 @@ package test import ( "fmt" "sync/atomic" - "time" "github.com/overmindtech/cli/go/sdp-go" - "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -75,11 +73,9 @@ func createTestItem(typ, value string) *sdp.Item { }, }, Metadata: &sdp.Metadata{ - SourceName: fmt.Sprintf("test-%v-adapter", typ), - Timestamp: timestamppb.Now(), - SourceDuration: durationpb.New(time.Second), - SourceDurationPerItem: durationpb.New(time.Second), - Hidden: true, + SourceName: fmt.Sprintf("test-%v-adapter", typ), + Timestamp: timestamppb.Now(), + Hidden: true, }, Scope: "test", // TODO(LIQs): delete empty data diff --git a/stdlib-source/build/package/Dockerfile b/stdlib-source/build/package/Dockerfile index 042521cc..d044f6cb 100644 --- a/stdlib-source/build/package/Dockerfile +++ b/stdlib-source/build/package/Dockerfile @@ -1,5 +1,5 @@ # Build the source binary -FROM golang:1.26.6-alpine3.23 AS builder +FROM golang:1.27.0-alpine3.23 AS builder ARG TARGETOS ARG TARGETARCH ARG BUILD_VERSION