From 2c4365ea35baf0a13df1d27ff6947593fe9600b1 Mon Sep 17 00:00:00 2001 From: Adam Crowder Date: Fri, 21 Mar 2025 12:35:19 -0700 Subject: [PATCH] Update aws-sdk-go-v2 dependencies --- go.mod | 46 +++++++------- go.sum | 92 ++++++++++++++-------------- pkg/awsapi/cloudwatchlogs.go | 71 +++++++++++++++++---- pkg/awsapi/eks.go | 21 +++++-- pkg/awsapi/elasticloadbalancingv2.go | 2 + pkg/awsapi/ssm.go | 14 +++-- pkg/eks/mocksv2/ELBV2.go | 74 ++++++++++++++++++++++ 7 files changed, 228 insertions(+), 92 deletions(-) diff --git a/go.mod b/go.mod index 0d8fb2d2e7..46323b8c09 100644 --- a/go.mod +++ b/go.mod @@ -9,23 +9,23 @@ require ( github.com/Masterminds/semver/v3 v3.3.1 github.com/aws/amazon-ec2-instance-selector/v3 v3.1.1-0.20250224180552-36eea73b44c2 github.com/aws/aws-sdk-go v1.55.6 - github.com/aws/aws-sdk-go-v2 v1.36.2 - github.com/aws/aws-sdk-go-v2/config v1.29.7 - github.com/aws/aws-sdk-go-v2/credentials v1.17.60 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.13 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.57.1 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.47.5 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.14 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.49.4 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.1 - github.com/aws/aws-sdk-go-v2/service/eks v1.58.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.18 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.13 - github.com/aws/aws-sdk-go-v2/service/iam v1.39.2 - github.com/aws/aws-sdk-go-v2/service/kms v1.36.2 - github.com/aws/aws-sdk-go-v2/service/outposts v1.48.8 - github.com/aws/aws-sdk-go-v2/service/ssm v1.56.13 - github.com/aws/aws-sdk-go-v2/service/sts v1.33.15 + github.com/aws/aws-sdk-go-v2 v1.36.3 + github.com/aws/aws-sdk-go-v2/config v1.29.9 + github.com/aws/aws-sdk-go-v2/credentials v1.17.62 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.58.1 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 + github.com/aws/aws-sdk-go-v2/service/eks v1.60.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.40.1 + github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 + github.com/aws/aws-sdk-go-v2/service/outposts v1.49.1 + github.com/aws/aws-sdk-go-v2/service/ssm v1.57.2 + github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 github.com/aws/smithy-go v1.22.3 github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9 github.com/benjamintf1/unmarshalledmatchers v1.0.0 @@ -129,22 +129,22 @@ require ( github.com/ashanbrown/makezero v1.2.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 // indirect github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17 // indirect github.com/aws/aws-sdk-go-v2/service/route53 v1.48.8 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1 // indirect github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.24.16 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bkielbasa/cyclop v1.2.3 // indirect diff --git a/go.sum b/go.sum index 4c399099c3..55a9fd0c5b 100644 --- a/go.sum +++ b/go.sum @@ -106,58 +106,58 @@ github.com/aws/amazon-ec2-instance-selector/v3 v3.1.1-0.20250224180552-36eea73b4 github.com/aws/amazon-ec2-instance-selector/v3 v3.1.1-0.20250224180552-36eea73b44c2/go.mod h1:RU/lVVsYHNN7Bwr2UmCw5z2aWPcNIHADY49bj082oYM= github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= -github.com/aws/aws-sdk-go-v2 v1.36.2 h1:Ub6I4lq/71+tPb/atswvToaLGVMxKZvjYDVOWEExOcU= -github.com/aws/aws-sdk-go-v2 v1.36.2/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= +github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= +github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 h1:zAybnyUQXIZ5mok5Jqwlf58/TFE7uvd3IAsa1aF9cXs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10/go.mod h1:qqvMj6gHLR/EXWZw4ZbqlPbQUyenf4h82UQUlKc+l14= -github.com/aws/aws-sdk-go-v2/config v1.29.7 h1:71nqi6gUbAUiEQkypHQcNVSFJVUFANpSeUNShiwWX2M= -github.com/aws/aws-sdk-go-v2/config v1.29.7/go.mod h1:yqJQ3nh2HWw/uxd56bicyvmDW4KSc+4wN6lL8pYjynU= -github.com/aws/aws-sdk-go-v2/credentials v1.17.60 h1:1dq+ELaT5ogfmqtV1eocq8SpOK1NRsuUfmhQtD/XAh4= -github.com/aws/aws-sdk-go-v2/credentials v1.17.60/go.mod h1:HDes+fn/xo9VeszXqjBVkxOo/aUy8Mc6QqKvZk32GlE= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29 h1:JO8pydejFKmGcUNiiwt75dzLHRWthkwApIvPoyUtXEg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.29/go.mod h1:adxZ9i9DRmB8zAT0pO0yGnsmu0geomp5a3uq5XpgOJ8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33 h1:knLyPMw3r3JsU8MFHWctE4/e2qWbPaxDYLlohPvnY8c= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.33/go.mod h1:EBp2HQ3f+XCB+5J+IoEbGhoV7CpJbnrsd4asNXmTL0A= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33 h1:K0+Ne08zqti8J9jwENxZ5NoUyBnaFDTu3apwQJWrwwA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.33/go.mod h1:K97stwwzaWzmqxO8yLGHhClbVW1tC6VT1pDLk1pGrq4= +github.com/aws/aws-sdk-go-v2/config v1.29.9 h1:Kg+fAYNaJeGXp1vmjtidss8O2uXIsXwaRqsQJKXVr+0= +github.com/aws/aws-sdk-go-v2/config v1.29.9/go.mod h1:oU3jj2O53kgOU4TXq/yipt6ryiooYjlkqqVaZk7gY/U= +github.com/aws/aws-sdk-go-v2/credentials v1.17.62 h1:fvtQY3zFzYJ9CfixuAQ96IxDrBajbBWGqjNTCa79ocU= +github.com/aws/aws-sdk-go-v2/credentials v1.17.62/go.mod h1:ElETBxIQqcxej++Cs8GyPBbgMys5DgQPTwo7cUPDKt8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33 h1:/frG8aV09yhCVSOEC2pzktflJJO48NwY3xntHBwxHiA= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.33/go.mod h1:8vwASlAcV366M+qxZnjNzCjeastk1Rt1bpSRaGZanGU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.13 h1:D3m1p6HFrhhSboV6O2cq5mGEhuJUjQVKurbwFCa7HXw= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.51.13/go.mod h1:q+zi8RJyzew7DEE4VVHcr0Z2cnddx72M8lugJR7/ASM= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.57.1 h1:7+rdg1/iSwNv2vZujTBdXfkSaR8zIAnQeAMpg5DWxmM= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.57.1/go.mod h1:BtDQEJAjeO5FGMMIByulR0wQt06P/kHfwoOlz3Kwbrs= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.47.5 h1:frkF4PY+dwlYlJiShrzhj9Uvo4FI43fD0CdY4k7lYdk= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.47.5/go.mod h1:kioLcY4u/EtRJuB+0h5yEB7lUDwSXqAyVI8gG5sVT7I= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.14 h1:Xc90sglbEnAC1X4d4ui422Ppw0HWjyNoqGAE1Dq+Rcg= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.45.14/go.mod h1:IbPFVuHnR+Klb3rrZHai890N1dnMCJZ0GeRfG0fj+ys= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.49.4 h1:Q1kQTn60/08JlTD2nFRNCEF+ti/SKUUZCQsOH6hVIFY= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.49.4/go.mod h1:wJt6TJKKWN4m5K5fU3+2OQibcsdUn5t1r8PyG8nUhjI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.1 h1:ZgY9zeVAe+54Qa7o1GXKRNTez79lffCeJSSinhl+qec= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.203.1/go.mod h1:0naMk66LtdeTmE+1CWQTKwtzOQ2t8mavOhMhR0Pv1m0= -github.com/aws/aws-sdk-go-v2/service/eks v1.58.1 h1:w/GEycBxTO4psb9Mw8g3b9/dktLE5GeYP1uj3nZ+85M= -github.com/aws/aws-sdk-go-v2/service/eks v1.58.1/go.mod h1:iBFJ86tzXjNjl3J+gJ8Y9Xz/S9JRAE3bTchQcjoMxYU= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.18 h1:Q59TDNnobz8VliHLFT4wSXSBxv/vBgcANThiHsJRYvA= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.28.18/go.mod h1:iH9oswXP5V5Zad3VZcSN0g7Oc2zibugzXDh5JCdfHS8= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.13 h1:KGRzQJot+18URahwyIR39RnMrCgVvGq9gPNoXsGLIO0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.43.13/go.mod h1:3baOeRIOTTrPoCRq6M47sOo/ypuHoFj7Xyv1N8zXR+s= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1 h1:wj4AION3NjQvjOiI8wm+TVU8y+8EsTl7fSgJAzk9cgc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.52.1/go.mod h1:CDqMoc3KRdZJ8qziW96J35lKH01Wq3B2aihtHj2JbRs= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.58.1 h1:Kk1jz6swm4FxpCjyhwQnvrEeODn08KhhvkSPFr82Tl0= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.58.1/go.mod h1:penaZKzGmqHGZId4EUCBIW/f9l4Y7hQ5NKd45yoCYuI= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2 h1:kkug2EBxwHbzlH9HeaAD2UsvZiOcelcJk4QNObUgsKg= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.48.2/go.mod h1:/BibEr5ksr34abqBTQN213GrNG6GCKCB6WG7CH4zH2w= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1 h1:IKznEkCo7L8VHkQ3tC1e50F1eudenoQ7BTHJhMOswtE= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.47.1/go.mod h1:uo14VBn5cNk/BPGTPz3kyLBxgpgOObgO8lmz+H7Z4Ck= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3 h1:4U9dpQZTvJ0Mi1qn8L1hRJ4igFCQYEjwUuOmYkWM5tE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.51.3/go.mod h1:ygltZT++6Wn2uG4+tqE0NW1MkdEtb5W2O/CFc0xJX/g= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1 h1:+4A9SDduLZFlDeXWRmfQ6r8kyEJZQfK6lcg+KwdvWrI= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.210.1/go.mod h1:ouvGEfHbLaIlWwpDpOVWPWR+YwO0HDv3vm5tYLq8ImY= +github.com/aws/aws-sdk-go-v2/service/eks v1.60.1 h1:Q5YEz2N233+N2rKuPF5qO0OR0qp69BnukHRmrnMjV0c= +github.com/aws/aws-sdk-go-v2/service/eks v1.60.1/go.mod h1:v1xXy6ea0PHtWkjFUvAUh6B/5wv7UF909Nru0dOIJDk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1 h1:HR2oZpKU1TDGGfLA0XgM3TGnapcjPKc5PEqAdMIinzU= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.1/go.mod h1:H232HdqVlSUoqy0cMJYW1TKjcxvGFGFZ20xQG8fOAPw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0 h1:RB7V8wT9ypjE/YJVBgKjoydTOh4IFoqceGiKxFH70mY= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.0/go.mod h1:xnCC3vFBfOKpU6PcsCKL2ktgBTZfOwTGxj6V8/X3IS4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12 h1:uH6GOnGSvVN9MCk6o3+HvZFpdqL7AzJKNOTM/6l+3/s= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.12/go.mod h1:6qtp53AQg7KEeYrsp430PNlmVVO9qK0Xw8nddE1y+ow= -github.com/aws/aws-sdk-go-v2/service/iam v1.39.2 h1:2JLLGua711n8vn773xw2iwGh0zxLJJ3UDWQ2L7fy0wY= -github.com/aws/aws-sdk-go-v2/service/iam v1.39.2/go.mod h1:ZpAQJqd/i2bgRVa4vTa1ZX96sWgd3MZ/dxkABRXqvyI= +github.com/aws/aws-sdk-go-v2/service/iam v1.40.1 h1:PaHCkW8rtLrA89xM/0LsY/NSIQETqmN+f1vt70EmpB8= +github.com/aws/aws-sdk-go-v2/service/iam v1.40.1/go.mod h1:mPJkGQzeCoPs82ElNILor2JzZgYENr4UaSKUT8K27+c= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.1 h1:7SuukGpyIgF5EiAbf1dZRxP+xSnY1WjiHBjL08fjJeE= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.6.1/go.mod h1:k+Vce/8R28tSozjdWphkrNhK8zLmdS9RgiDNZl6p8Rw= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14 h1:2scbY6//jy/s8+5vGrk7l1+UtHl0h9A4MjOO2k/TM2E= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.14/go.mod h1:bRpZPHZpSe5YRHmPfK3h1M7UBFCn2szHzyx0rw04zro= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14 h1:fgdkfsxTehqPcIQa24G/Omwv9RocTq2UcONNX/OnrZI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.14/go.mod h1:wMxQ3OE8fiM8z2YRAeb2J8DLTTWMvRyYYuQOs26AbTQ= -github.com/aws/aws-sdk-go-v2/service/kms v1.36.2 h1:yERi4A+3+9emx/NKSQ5bf0QP7DHCGU0bjv3pxdpDcsg= -github.com/aws/aws-sdk-go-v2/service/kms v1.36.2/go.mod h1:OHmlX4+o0XIlJAQGAHPIy0N9yZcYS/vNG+T7geSNcFw= -github.com/aws/aws-sdk-go-v2/service/outposts v1.48.8 h1:6wiFD/fDMod2ZmtTbuDJlg/W1zNpTOxvNwUs36YUjtQ= -github.com/aws/aws-sdk-go-v2/service/outposts v1.48.8/go.mod h1:c+BQK5S5WFmV51H/NgOuxBUmFAncY9De3ulcg4UYGYE= +github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 h1:tecq7+mAav5byF+Mr+iONJnCBf4B4gon8RSp4BrweSc= +github.com/aws/aws-sdk-go-v2/service/kms v1.38.1/go.mod h1:cQn6tAF77Di6m4huxovNM7NVAozWTZLsDRp9t8Z/WYk= +github.com/aws/aws-sdk-go-v2/service/outposts v1.49.1 h1:d7ITpiqSzAqJCQw615hpeSj0X6npcmQxSDd4gi4at3w= +github.com/aws/aws-sdk-go-v2/service/outposts v1.49.1/go.mod h1:2V3R0VgqiX+jSmn3dNq0yglSf1YuwxCJjsO6ME3XYxs= github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17 h1:EtZFyL/uhaXlHjIwHW0KSJvppg+Ie1fzQ3wEXLEUj0I= github.com/aws/aws-sdk-go-v2/service/pricing v1.32.17/go.mod h1:l7bufyRvU+8mY0Z1BNWbWvjr59dlj9YrLKmeiz5CJ30= github.com/aws/aws-sdk-go-v2/service/route53 v1.48.8 h1:abeu0IVRqYXSts7Tl1Yoi/BxC59xdXYX0uVSN0fbPOk= @@ -166,14 +166,14 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1 h1:5bI9tJL2Z0FGFtp/LPDv0eyliFBHC github.com/aws/aws-sdk-go-v2/service/s3 v1.77.1/go.mod h1:njj3tSJONkfdLt4y6X8pyqeM6sJLNZxmzctKKV+n1GM= github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15 h1:KRXf9/NWjoRgj2WJbX13GNjBPQ1SxUYLnIfXTz08mWs= github.com/aws/aws-sdk-go-v2/service/sqs v1.37.15/go.mod h1:1CY54O4jz8BzgH2d6KyrzKWr2bAoqKsqUv2YZUGwMLE= -github.com/aws/aws-sdk-go-v2/service/ssm v1.56.13 h1:JfPeW7F6Y+VqBg6p+8zQv4wlgceguYu5ZT0USEGZ89g= -github.com/aws/aws-sdk-go-v2/service/ssm v1.56.13/go.mod h1:EonGQFn66wZkJJrrKXrryrxoS3V30rcHvaWvc6oGHCI= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.16 h1:YV6xIKDJp6U7YB2bxfud9IENO1LRpGhe2Tv/OKtPrOQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.16/go.mod h1:DvbmMKgtpA6OihFJK13gHMZOZrCHttz8wPHGKXqU+3o= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15 h1:kMyK3aKotq1aTBsj1eS8ERJLjqYRRRcsmP33ozlCvlk= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.15/go.mod h1:5uPZU7vSNzb8Y0dm75xTikinegPYK3uJmIHQZFq5Aqo= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.15 h1:ht1jVmeeo2anR7zDiYJLSnRYnO/9NILXXu42FP3rJg0= -github.com/aws/aws-sdk-go-v2/service/sts v1.33.15/go.mod h1:xWZ5cOiFe3czngChE4LhCBqUxNwgfwndEF7XlYP/yD8= +github.com/aws/aws-sdk-go-v2/service/ssm v1.57.2 h1:3//q1r7gW/kpiWiPfFILw+N81rangyyMJV6vrznFyvw= +github.com/aws/aws-sdk-go-v2/service/ssm v1.57.2/go.mod h1:PUWUl5MDiYNQkUHN9Pyd9kgtA/YhbxnSnHP+yQqzrM8= +github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 h1:8JdC7Gr9NROg1Rusk25IcZeTO59zLxsKgE0gkh5O6h0= +github.com/aws/aws-sdk-go-v2/service/sso v1.25.1/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 h1:KwuLovgQPcdjNMfFt9OhUd9a2OwcOKhxfvF4glTzLuA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5G5Aoj+eMCn4T+1Kc= +github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4= github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k= github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/awslabs/amazon-eks-ami/nodeadm v0.0.0-20250219002025-c3b5cd3d2fd9 h1:fopAsvwV3w+MGIX3oWqq0YmwL+lr/ik+wXt0gyDaEEY= diff --git a/pkg/awsapi/cloudwatchlogs.go b/pkg/awsapi/cloudwatchlogs.go index 7e933cb92e..1a3c4c8283 100644 --- a/pkg/awsapi/cloudwatchlogs.go +++ b/pkg/awsapi/cloudwatchlogs.go @@ -501,8 +501,14 @@ type CloudWatchLogs interface { // [StartQuery]: https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartQuery.html DisassociateKmsKey(ctx context.Context, params *DisassociateKmsKeyInput, optFns ...func(*Options)) (*DisassociateKmsKeyOutput, error) // Lists log events from the specified log group. You can list all the log events - // or filter the results using a filter pattern, a time range, and the name of the - // log stream. + // or filter the results using one or more of the following: + // + // - A filter pattern + // + // - A time range + // + // - The log stream name, or a log stream name prefix that matches mutltiple log + // streams // // You must have the logs:FilterLogEvents permission to perform this operation. // @@ -510,12 +516,23 @@ type CloudWatchLogs interface { // logGroupName . You must include one of these two parameters, but you can't // include both. // - // By default, this operation returns as many log events as can fit in 1 MB (up to - // 10,000 log events) or all the events found within the specified time range. If - // the results include a token, that means there are more log events available. You - // can get additional results by specifying the token in a subsequent call. This - // operation can return empty results while there are more log events available - // through the token. + // FilterLogEvents is a paginated operation. Each page returned can contain up to + // 1 MB of log events or up to 10,000 log events. A returned page might only be + // partially full, or even empty. For example, if the result of a query would + // return 15,000 log events, the first page isn't guaranteed to have 10,000 log + // events even if they all fit into 1 MB. + // + // Partially full or empty pages don't necessarily mean that pagination is + // finished. If the results include a nextToken , there might be more log events + // available. You can return these additional log events by providing the nextToken + // in a subsequent FilterLogEvents operation. If the results don't include a + // nextToken , then pagination is finished. + // + // If you set startFromHead to true and you don’t include endTime in your request, + // you can end up in a situation where the pagination doesn't terminate. This can + // happen when the new log events are being added to the target log streams faster + // than they are being read. This situation is a good use case for the CloudWatch + // Logs [Live Tail]feature. // // The returned log events are sorted by event timestamp, the timestamp when the // event was ingested by CloudWatch Logs, and the ID of the PutLogEvents request. @@ -524,7 +541,14 @@ type CloudWatchLogs interface { // operation in a monitoring account and view data from the linked source accounts. // For more information, see [CloudWatch cross-account observability]. // + // If you are using [log transformation], the FilterLogEvents operation returns only the original + // versions of log events, before they were transformed. To view the transformed + // versions, you must use a [CloudWatch Logs query.] + // + // [log transformation]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html // [CloudWatch cross-account observability]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html + // [CloudWatch Logs query.]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AnalyzingLogData.html + // [Live Tail]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html FilterLogEvents(ctx context.Context, params *FilterLogEventsInput, optFns ...func(*Options)) (*FilterLogEventsOutput, error) // Returns information about a log group data protection policy. GetDataProtectionPolicy(ctx context.Context, params *GetDataProtectionPolicyInput, optFns ...func(*Options)) (*GetDataProtectionPolicyOutput, error) @@ -557,15 +581,29 @@ type CloudWatchLogs interface { // Returns information about one integration between CloudWatch Logs and // OpenSearch Service. GetIntegration(ctx context.Context, params *GetIntegrationInput, optFns ...func(*Options)) (*GetIntegrationOutput, error) - // Retrieves information about the log anomaly detector that you specify. + // Retrieves information about the log anomaly detector that you specify. The KMS + // key ARN detected is valid. GetLogAnomalyDetector(ctx context.Context, params *GetLogAnomalyDetectorInput, optFns ...func(*Options)) (*GetLogAnomalyDetectorOutput, error) // Lists log events from the specified log stream. You can list all of the log // events or filter using a time range. // - // By default, this operation returns as many log events as can fit in a response - // size of 1MB (up to 10,000 log events). You can get additional log events by - // specifying one of the tokens in a subsequent call. This operation can return - // empty results while there are more log events available through the token. + // GetLogEvents is a paginated operation. Each page returned can contain up to 1 + // MB of log events or up to 10,000 log events. A returned page might only be + // partially full, or even empty. For example, if the result of a query would + // return 15,000 log events, the first page isn't guaranteed to have 10,000 log + // events even if they all fit into 1 MB. + // + // Partially full or empty pages don't necessarily mean that pagination is + // finished. As long as the nextBackwardToken or nextForwardToken returned is NOT + // equal to the nextToken that you passed into the API call, there might be more + // log events available. The token that you use depends on the direction you want + // to move in along the log stream. The returned tokens are never null. + // + // If you set startFromHead to true and you don’t include endTime in your request, + // you can end up in a situation where the pagination doesn't terminate. This can + // happen when the new log events are being added to the target log streams faster + // than they are being read. This situation is a good use case for the CloudWatch + // Logs [Live Tail]feature. // // If you are using CloudWatch cross-account observability, you can use this // operation in a monitoring account and view data from the linked source accounts. @@ -575,7 +613,14 @@ type CloudWatchLogs interface { // logGroupName . You must include one of these two parameters, but you can't // include both. // + // If you are using [log transformation], the GetLogEvents operation returns only the original + // versions of log events, before they were transformed. To view the transformed + // versions, you must use a [CloudWatch Logs query.] + // + // [log transformation]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch-Logs-Transformation.html // [CloudWatch cross-account observability]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html + // [CloudWatch Logs query.]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AnalyzingLogData.html + // [Live Tail]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html GetLogEvents(ctx context.Context, params *GetLogEventsInput, optFns ...func(*Options)) (*GetLogEventsOutput, error) // Returns a list of the fields that are included in log events in the specified // log group. Includes the percentage of log events that contain each field. The diff --git a/pkg/awsapi/eks.go b/pkg/awsapi/eks.go index ffa6b27c43..4b912b1854 100644 --- a/pkg/awsapi/eks.go +++ b/pkg/awsapi/eks.go @@ -150,8 +150,13 @@ type EKS interface { // You can only create a node group for your cluster that is equal to the current // Kubernetes version for the cluster. All node groups are created with the latest // AMI release version for the respective minor Kubernetes version of the cluster, - // unless you deploy a custom AMI using a launch template. For more information - // about using launch templates, see [Customizing managed nodes with launch templates]. + // unless you deploy a custom AMI using a launch template. + // + // For later updates, you will only be able to update a node group using a launch + // template only if it was originally deployed with a launch template. + // Additionally, the launch template ID or name must match what was used when the + // node group was created. You can update the launch template version with + // necessary changes. For more information about using launch templates, see [Customizing managed nodes with launch templates]. // // An Amazon EKS managed node group is an Amazon EC2 Auto Scaling group and // associated Amazon EC2 instances that are managed by Amazon Web Services for an @@ -431,10 +436,14 @@ type EKS interface { // group. // // You can update a node group using a launch template only if the node group was - // originally deployed with a launch template. If you need to update a custom AMI - // in a node group that was deployed with a launch template, then update your - // custom AMI, specify the new ID in a new version of the launch template, and then - // update the node group to the new version of the launch template. + // originally deployed with a launch template. Additionally, the launch template ID + // or name must match what was used when the node group was created. You can update + // the launch template version with necessary changes. + // + // If you need to update a custom AMI in a node group that was deployed with a + // launch template, then update your custom AMI, specify the new ID in a new + // version of the launch template, and then update the node group to the new + // version of the launch template. // // If you update without a launch template, then you can update to the latest // available AMI version of a node group's current Kubernetes version by not diff --git a/pkg/awsapi/elasticloadbalancingv2.go b/pkg/awsapi/elasticloadbalancingv2.go index efda03676e..c91c41befe 100644 --- a/pkg/awsapi/elasticloadbalancingv2.go +++ b/pkg/awsapi/elasticloadbalancingv2.go @@ -274,6 +274,8 @@ type ELBV2 interface { // When modifying capacity reservation, you must include at least one // MinimumLoadBalancerCapacity or ResetCapacityReservation . ModifyCapacityReservation(ctx context.Context, params *ModifyCapacityReservationInput, optFns ...func(*Options)) (*ModifyCapacityReservationOutput, error) + // [Application Load Balancers] Modify the IP pool associated to a load balancer. + ModifyIpPools(ctx context.Context, params *ModifyIpPoolsInput, optFns ...func(*Options)) (*ModifyIpPoolsOutput, error) // Replaces the specified properties of the specified listener. Any properties // that you do not specify remain unchanged. // diff --git a/pkg/awsapi/ssm.go b/pkg/awsapi/ssm.go index 5570840023..478809cd27 100644 --- a/pkg/awsapi/ssm.go +++ b/pkg/awsapi/ssm.go @@ -250,9 +250,15 @@ type SSM interface { // // [Working with shared parameters]: https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-shared-parameters.html DeleteResourcePolicy(ctx context.Context, params *DeleteResourcePolicyInput, optFns ...func(*Options)) (*DeleteResourcePolicyOutput, error) - // Removes the server or virtual machine from the list of registered servers. You - // can reregister the node again at any time. If you don't plan to use Run Command - // on the server, we suggest uninstalling SSM Agent first. + // Removes the server or virtual machine from the list of registered servers. + // + // If you want to reregister an on-premises server, edge device, or VM, you must + // use a different Activation Code and Activation ID than used to register the + // machine previously. The Activation Code and Activation ID must not have already + // been used on the maximum number of activations specified when they were created. + // For more information, see [Deregistering managed nodes in a hybrid and multicloud environment]in the Amazon Web Services Systems Manager User Guide. + // + // [Deregistering managed nodes in a hybrid and multicloud environment]: https://docs.aws.amazon.com/systems-manager/latest/userguide/fleet-manager-deregister-hybrid-nodes.html DeregisterManagedInstance(ctx context.Context, params *DeregisterManagedInstanceInput, optFns ...func(*Options)) (*DeregisterManagedInstanceOutput, error) // Removes a patch group from a patch baseline. DeregisterPatchBaselineForPatchGroup(ctx context.Context, params *DeregisterPatchBaselineForPatchGroupInput, optFns ...func(*Options)) (*DeregisterPatchBaselineForPatchGroupOutput, error) @@ -732,7 +738,7 @@ type SSM interface { // adds an inventory item, if it doesn't already exist, or updates an inventory // item, if it does exist. PutInventory(ctx context.Context, params *PutInventoryInput, optFns ...func(*Options)) (*PutInventoryOutput, error) - // Add a parameter to the system. + // Create or update a parameter in Parameter Store. PutParameter(ctx context.Context, params *PutParameterInput, optFns ...func(*Options)) (*PutParameterOutput, error) // Creates or updates a Systems Manager resource policy. A resource policy helps // you to define the IAM entity (for example, an Amazon Web Services account) that diff --git a/pkg/eks/mocksv2/ELBV2.go b/pkg/eks/mocksv2/ELBV2.go index 9a92554c2d..c89248f467 100644 --- a/pkg/eks/mocksv2/ELBV2.go +++ b/pkg/eks/mocksv2/ELBV2.go @@ -2612,6 +2612,80 @@ func (_c *ELBV2_ModifyCapacityReservation_Call) RunAndReturn(run func(context.Co return _c } +// ModifyIpPools provides a mock function with given fields: ctx, params, optFns +func (_m *ELBV2) ModifyIpPools(ctx context.Context, params *elasticloadbalancingv2.ModifyIpPoolsInput, optFns ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyIpPoolsOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for ModifyIpPools") + } + + var r0 *elasticloadbalancingv2.ModifyIpPoolsOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyIpPoolsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyIpPoolsOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *elasticloadbalancingv2.ModifyIpPoolsInput, ...func(*elasticloadbalancingv2.Options)) *elasticloadbalancingv2.ModifyIpPoolsOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*elasticloadbalancingv2.ModifyIpPoolsOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *elasticloadbalancingv2.ModifyIpPoolsInput, ...func(*elasticloadbalancingv2.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ELBV2_ModifyIpPools_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ModifyIpPools' +type ELBV2_ModifyIpPools_Call struct { + *mock.Call +} + +// ModifyIpPools is a helper method to define mock.On call +// - ctx context.Context +// - params *elasticloadbalancingv2.ModifyIpPoolsInput +// - optFns ...func(*elasticloadbalancingv2.Options) +func (_e *ELBV2_Expecter) ModifyIpPools(ctx interface{}, params interface{}, optFns ...interface{}) *ELBV2_ModifyIpPools_Call { + return &ELBV2_ModifyIpPools_Call{Call: _e.mock.On("ModifyIpPools", + append([]interface{}{ctx, params}, optFns...)...)} +} + +func (_c *ELBV2_ModifyIpPools_Call) Run(run func(ctx context.Context, params *elasticloadbalancingv2.ModifyIpPoolsInput, optFns ...func(*elasticloadbalancingv2.Options))) *ELBV2_ModifyIpPools_Call { + _c.Call.Run(func(args mock.Arguments) { + variadicArgs := make([]func(*elasticloadbalancingv2.Options), len(args)-2) + for i, a := range args[2:] { + if a != nil { + variadicArgs[i] = a.(func(*elasticloadbalancingv2.Options)) + } + } + run(args[0].(context.Context), args[1].(*elasticloadbalancingv2.ModifyIpPoolsInput), variadicArgs...) + }) + return _c +} + +func (_c *ELBV2_ModifyIpPools_Call) Return(_a0 *elasticloadbalancingv2.ModifyIpPoolsOutput, _a1 error) *ELBV2_ModifyIpPools_Call { + _c.Call.Return(_a0, _a1) + return _c +} + +func (_c *ELBV2_ModifyIpPools_Call) RunAndReturn(run func(context.Context, *elasticloadbalancingv2.ModifyIpPoolsInput, ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyIpPoolsOutput, error)) *ELBV2_ModifyIpPools_Call { + _c.Call.Return(run) + return _c +} + // ModifyListener provides a mock function with given fields: ctx, params, optFns func (_m *ELBV2) ModifyListener(ctx context.Context, params *elasticloadbalancingv2.ModifyListenerInput, optFns ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.ModifyListenerOutput, error) { _va := make([]interface{}, len(optFns))