diff --git a/.vscode/settings.json b/.vscode/settings.json index 5e6d8c5c..be8b7103 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -66,6 +66,7 @@ "stscreds", "syslist", "Tracef", + "uber", "unmarshalling", "usrr", "usrs", diff --git a/go.mod b/go.mod index c111e955..d34141b5 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,18 @@ go 1.23 require ( github.com/aws/aws-lambda-go v1.47.0 - github.com/aws/aws-sdk-go-v2 v1.32.3 - github.com/aws/aws-sdk-go-v2/config v1.28.1 - github.com/aws/aws-sdk-go-v2/credentials v1.17.42 - github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3 - github.com/golang/mock v1.6.0 + github.com/aws/aws-sdk-go-v2 v1.32.4 + github.com/aws/aws-sdk-go-v2/config v1.28.2 + github.com/aws/aws-sdk-go-v2/credentials v1.17.43 + github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.4 github.com/google/go-cmp v0.6.0 github.com/hashicorp/go-retryablehttp v0.7.7 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 + go.uber.org/mock v0.5.0 golang.org/x/oauth2 v0.23.0 google.golang.org/api v0.204.0 gopkg.in/yaml.v3 v3.0.1 @@ -26,18 +26,18 @@ require ( cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect cloud.google.com/go/compute/metadata v0.5.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.24.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 // indirect github.com/aws/smithy-go v1.22.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -74,7 +74,7 @@ require ( golang.org/x/net v0.30.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect google.golang.org/grpc v1.67.1 // indirect google.golang.org/protobuf v1.35.1 // indirect diff --git a/go.sum b/go.sum index 61d17072..cc737513 100644 --- a/go.sum +++ b/go.sum @@ -8,42 +8,42 @@ cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/yb github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/aws/aws-lambda-go v1.47.0 h1:0H8s0vumYx/YKs4sE7YM0ktwL2eWse+kfopsRI1sXVI= github.com/aws/aws-lambda-go v1.47.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A= -github.com/aws/aws-sdk-go-v2 v1.32.3 h1:T0dRlFBKcdaUPGNtkBSwHZxrtis8CQU17UpNBZYd0wk= -github.com/aws/aws-sdk-go-v2 v1.32.3/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo= +github.com/aws/aws-sdk-go-v2 v1.32.4 h1:S13INUiTxgrPueTmrm5DZ+MiAo99zYzHEFh1UNkOxNE= +github.com/aws/aws-sdk-go-v2 v1.32.4/go.mod h1:2SK5n0a2karNTv5tbP1SjsX0uhttou00v/HpXKM1ZUo= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0DfJUEQuqPild8jRGmSFmBgvydr0= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA= -github.com/aws/aws-sdk-go-v2/config v1.28.1 h1:oxIvOUXy8x0U3fR//0eq+RdCKimWI900+SV+10xsCBw= -github.com/aws/aws-sdk-go-v2/config v1.28.1/go.mod h1:bRQcttQJiARbd5JZxw6wG0yIK3eLeSCPdg6uqmmlIiI= -github.com/aws/aws-sdk-go-v2/credentials v1.17.42 h1:sBP0RPjBU4neGpIYyx8mkU2QqLPl5u9cmdTWVzIpHkM= -github.com/aws/aws-sdk-go-v2/credentials v1.17.42/go.mod h1:FwZBfU530dJ26rv9saAbxa9Ej3eF/AK0OAY86k13n4M= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18 h1:68jFVtt3NulEzojFesM/WVarlFpCaXLKaBxDpzkQ9OQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18/go.mod h1:Fjnn5jQVIo6VyedMc0/EhPpfNlPl7dHV916O6B+49aE= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 h1:Jw50LwEkVjuVzE1NzkhNKkBf9cRN7MtE1F/b2cOKTUM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22/go.mod h1:Y/SmAyPcOTmpeVaWSzSKiILfXTVJwrGmYZhcRbhWuEY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 h1:981MHwBaRZM7+9QSR6XamDzF/o7ouUGxFzr+nVSIhrs= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22/go.mod h1:1RA1+aBEfn+CAB/Mh0MB6LsdCYCnjZm7tKXtnk499ZQ= +github.com/aws/aws-sdk-go-v2/config v1.28.2 h1:FLvWA97elBiSPdIol4CXfIAY1wlq3KzoSgkMuZSuSe8= +github.com/aws/aws-sdk-go-v2/config v1.28.2/go.mod h1:hNmQsKfUqpKz2yfnZUB60GCemPmeqAalVTui0gOxjAE= +github.com/aws/aws-sdk-go-v2/credentials v1.17.43 h1:SEGdVOOE1Wyr2XFKQopQ5GYjym3nYHcphesdt78rNkY= +github.com/aws/aws-sdk-go-v2/credentials v1.17.43/go.mod h1:3aiza5kSyAE4eujSanOkSkAmX/RnVqslM+GRQ/Xvv4c= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 h1:woXadbf0c7enQ2UGCi8gW/WuKmE0xIzxBF/eD94jMKQ= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19/go.mod h1:zminj5ucw7w0r65bP6nhyOd3xL6veAUMc3ElGMoLVb4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 h1:A2w6m6Tmr+BNXjDsr7M90zkWjsu4JXHwrzPg235STs4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23/go.mod h1:35EVp9wyeANdujZruvHiQUAo9E3vbhnIO1mTCAxMlY0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 h1:pgYW9FCabt2M25MoHYCfMrVY2ghiiBKYWUVXfwZs+sU= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23/go.mod h1:c48kLgzO19wAu3CPkDWC28JbaJ+hfQlsdl7I2+oqIbk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22 h1:yV+hCAHZZYJQcwAaszoBNwLbPItHvApxT0kVIw6jRgs= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.22/go.mod h1:kbR1TL8llqB1eGnVbybcA4/wgScxdylOdyAd51yxPdw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23 h1:1SZBDiRzzs3sNhOMVApyWPduWYGAX0imGy06XiBnCAM= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.23/go.mod h1:i9TkxgbZmHVh2S0La6CAXtnyFhlCX/pJ0JsOvBAS6Mk= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 h1:TToQNkvGguu209puTojY/ozlqy2d/SFNcoLIqTFi42g= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0/go.mod h1:0jp+ltwkf+SwG2fm/PKo8t4y8pJSgOCO4D8Lz3k0aHQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3 h1:kT6BcZsmMtNkP/iYMcRG+mIEA/IbeiUimXtGmqF39y0= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.3/go.mod h1:Z8uGua2k4PPaGOYn66pK02rhMrot3Xk3tpBuUFPomZU= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 h1:qcxX0JYlgWH3hpPUnd6U0ikcl6LLA9sLkXE2w1fpMvY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3/go.mod h1:cLSNEmI45soc+Ef8K/L+8sEA3A3pYFEYf5B5UI+6bH4= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3 h1:ZC7Y/XgKUxwqcdhO5LE8P6oGP1eh6xlQReWNKfhvJno= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.3/go.mod h1:WqfO7M9l9yUAw0HcHaikwRd/H6gzYdz7vjejCA5e2oY= -github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 h1:p9TNFL8bFUMd+38YIpTAXpoxyz0MxC7FlbFEH4P4E1U= -github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2/go.mod h1:fNjyo0Coen9QTwQLWeV6WO2Nytwiu+cCcWaTdKCAqqE= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3 h1:CyA6J82ePPoh1Nj8ErOR2e/JRlzfFzWpGwGMFzFjwZg= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.3/go.mod h1:EliITPlGcBz0FRiVl7lRLtzI1cnDybFcfLYMZedOInE= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 h1:UTpsIf0loCIWEbrqdLb+0RxnTXfWh2vhw4nQmFi4nPc= -github.com/aws/aws-sdk-go-v2/service/sso v1.24.3/go.mod h1:FZ9j3PFHHAR+w0BSEjK955w5YD2UwB/l/H0yAK3MJvI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 h1:2YCmIXv3tmiItw0LlYf6v7gEHebLY45kBEnPezbUKyU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3/go.mod h1:u19stRyNPxGhj6dRm+Cdgu6N75qnbW7+QN0q0dsAk58= -github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 h1:wVnQ6tigGsRqSWDEEyH6lSAJ9OyFUsSnbaUWChuSGzs= -github.com/aws/aws-sdk-go-v2/service/sts v1.32.3/go.mod h1:VZa9yTFyj4o10YGsmDO4gbQJUvvhY72fhumT8W4LqsE= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4 h1:aaPpoG15S2qHkWm4KlEyF01zovK1nW4BBbyXuHNSE90= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.4/go.mod h1:eD9gS2EARTKgGr/W5xwgY/ik9z/zqpW+m/xOQbVxrMk= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 h1:tHxQi/XHPK0ctd/wdOw0t7Xrc2OxcRCnVzv8lwWPu0c= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4/go.mod h1:4GQbF1vJzG60poZqWatZlhP31y8PGCCVTvIGPdaaYJ0= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4 h1:E5ZAVOmI2apR8ADb72Q63KqwwwdW1XcMeXIlrZ1Psjg= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.4/go.mod h1:wezzqVUOVVdk+2Z/JzQT4NxAU0NbhRe5W8pIE72jsWI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3 h1:neNOYJl72bHrz9ikAEED4VqWyND/Po0DnEx64RW6YM4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.66.3/go.mod h1:TMhLIyRIyoGVlaEMAt+ITMbwskSTpcGsCPDq91/ihY0= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.4 h1:YQheBh+MS27cJG1K6VO3A6AzNhkq8ETp1g7l0KMcdss= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.4/go.mod h1:FTCjaQxTVVQqLQ4ktBsLNZPnJ9pVLkJ6F0qVwtALaxk= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.4 h1:BqE3NRG6bsODh++VMKMsDmFuJTHrdD4rJZqHjDeF6XI= +github.com/aws/aws-sdk-go-v2/service/sso v1.24.4/go.mod h1:wrMCEwjFPms+V86TCQQeOxQF/If4vT44FGIOFiMC2ck= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 h1:zcx9LiGWZ6i6pjdcoE9oXAB6mUdeyC36Ia/QEiIvYdg= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4/go.mod h1:Tp/ly1cTjRLGBBmNccFumbZ8oqpZlpdhFf80SrRh4is= +github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 h1:yDxvkz3/uOKfxnv8YhzOi9m+2OGIxF+on3KOISbK5IU= +github.com/aws/aws-sdk-go-v2/service/sts v1.32.4/go.mod h1:9XEUty5v5UAsMiFOBJrNibZgwCeOma73jgGwwhgffa8= github.com/aws/smithy-go v1.22.0 h1:uunKnWlcoL3zO7q+gG2Pk53joueEOsnNB28QdMsmiMM= github.com/aws/smithy-go v1.22.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -76,8 +76,6 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -166,7 +164,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= @@ -177,10 +174,11 @@ go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2 go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= @@ -190,15 +188,12 @@ golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= 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-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -207,19 +202,14 @@ golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= @@ -229,12 +219,7 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/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-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.204.0 h1:3PjmQQEDkR/ENVZZwIYB4W/KzYtN8OrqnNcHWpeR8E4= google.golang.org/api v0.204.0/go.mod h1:69y8QSoKIbL9F94bWgWAq6wGqGwyjBgi2y8rAK8zLag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -242,8 +227,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= -google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 h1:2oV8dfuIkM1Ti7DwXc0BJfnwr9csz4TDXI9EmiI+Rbw= +google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38/go.mod h1:vuAjtvlwkDKF6L1GQ0SokiRLCGFfeBUXWr/aFFkHACc= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI= google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= diff --git a/internal/core/idp.go b/internal/core/idp.go index dfb03475..b04b168c 100644 --- a/internal/core/idp.go +++ b/internal/core/idp.go @@ -6,7 +6,7 @@ import ( "github.com/slashdevops/idp-scim-sync/internal/model" ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/core/idp_mocks.go -source=idp.go +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/core/idp_mocks.go -source=idp.go // IdentityProviderService is the interface consumed by the core services and // needs to be implemented by the Identity Provider service. diff --git a/internal/core/options_test.go b/internal/core/options_test.go index 81e94a06..ea0bc896 100644 --- a/internal/core/options_test.go +++ b/internal/core/options_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - gomock "github.com/golang/mock/gomock" mocks "github.com/slashdevops/idp-scim-sync/mocks/core" + "go.uber.org/mock/gomock" ) func TestWithIdentityProviderGroupsFilter(t *testing.T) { diff --git a/internal/core/reconciling_test.go b/internal/core/reconciling_test.go index 8c149aa8..f0dc7f87 100644 --- a/internal/core/reconciling_test.go +++ b/internal/core/reconciling_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - gomock "github.com/golang/mock/gomock" "github.com/slashdevops/idp-scim-sync/internal/model" mocks "github.com/slashdevops/idp-scim-sync/mocks/core" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func TestReconcilingGroups(t *testing.T) { diff --git a/internal/core/repository.go b/internal/core/repository.go index 9b9c498e..6b0f62e0 100644 --- a/internal/core/repository.go +++ b/internal/core/repository.go @@ -6,7 +6,7 @@ import ( "github.com/slashdevops/idp-scim-sync/internal/model" ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/core/repository_mocks.go -source=repository.go +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/core/repository_mocks.go -source=repository.go // StateRepository is an interface for a repository that stores the state of the // synchronization process. diff --git a/internal/core/scim.go b/internal/core/scim.go index a687bde4..6316fe6f 100644 --- a/internal/core/scim.go +++ b/internal/core/scim.go @@ -6,7 +6,7 @@ import ( "github.com/slashdevops/idp-scim-sync/internal/model" ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/core/scim_mocks.go -source=scim.go +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/core/scim_mocks.go -source=scim.go // SCIMService is the interface that needs to be implemented by the // SCIM Provider service. diff --git a/internal/core/sync_test.go b/internal/core/sync_test.go index d91ca6d8..1cae2545 100644 --- a/internal/core/sync_test.go +++ b/internal/core/sync_test.go @@ -9,7 +9,6 @@ import ( "os" "testing" - gomock "github.com/golang/mock/gomock" "github.com/slashdevops/idp-scim-sync/internal/idp" "github.com/slashdevops/idp-scim-sync/internal/model" "github.com/slashdevops/idp-scim-sync/internal/repository" @@ -18,6 +17,7 @@ import ( "github.com/slashdevops/idp-scim-sync/pkg/aws" "github.com/slashdevops/idp-scim-sync/pkg/google" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" admin "google.golang.org/api/admin/directory/v1" "google.golang.org/api/option" ) diff --git a/internal/idp/idp.go b/internal/idp/idp.go index 3db77937..7cb81c26 100644 --- a/internal/idp/idp.go +++ b/internal/idp/idp.go @@ -24,7 +24,7 @@ var ( ErrGroupResultNil = errors.New("provider: group result is nil") ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/idp/idp_mocks.go -source=idp.go GoogleProviderService +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/idp/idp_mocks.go -source=idp.go GoogleProviderService // GoogleProviderService is the interface that wraps the Google Provider Service methods. type GoogleProviderService interface { diff --git a/internal/idp/idp_test.go b/internal/idp/idp_test.go index 18cf47e6..3e61a850 100644 --- a/internal/idp/idp_test.go +++ b/internal/idp/idp_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - gomock "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/slashdevops/idp-scim-sync/internal/model" + "go.uber.org/mock/gomock" mocks "github.com/slashdevops/idp-scim-sync/mocks/idp" "github.com/stretchr/testify/assert" diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 52d72ead..277addbd 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/repository/repository_mocks.go -source=repository.go +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/repository/repository_mocks.go -source=repository.go // S3ClientAPI is an interface to consume S3 client methods type S3ClientAPI interface { diff --git a/internal/repository/s3_test.go b/internal/repository/s3_test.go index fe15b2a8..dd89a529 100644 --- a/internal/repository/s3_test.go +++ b/internal/repository/s3_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/s3" - "github.com/golang/mock/gomock" "github.com/slashdevops/idp-scim-sync/internal/model" + "go.uber.org/mock/gomock" mocks "github.com/slashdevops/idp-scim-sync/mocks/repository" "github.com/stretchr/testify/assert" diff --git a/internal/scim/scim.go b/internal/scim/scim.go index ab7d54be..1538c0a5 100644 --- a/internal/scim/scim.go +++ b/internal/scim/scim.go @@ -11,7 +11,7 @@ import ( // This implement core.SCIMService interface -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/scim/scim_mocks.go -source=scim.go AWSSCIMProvider +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/scim/scim_mocks.go -source=scim.go AWSSCIMProvider // AWSSCIMProvider interface to consume aws package methods type AWSSCIMProvider interface { diff --git a/internal/scim/scim_test.go b/internal/scim/scim_test.go index a07cbb8f..ad9748c3 100644 --- a/internal/scim/scim_test.go +++ b/internal/scim/scim_test.go @@ -6,11 +6,11 @@ import ( "fmt" "testing" - "github.com/golang/mock/gomock" "github.com/slashdevops/idp-scim-sync/internal/model" mocks "github.com/slashdevops/idp-scim-sync/mocks/scim" "github.com/slashdevops/idp-scim-sync/pkg/aws" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) // groupMembersGenerator helper function to generate test data for GetGroupMembers diff --git a/mocks/aws/scim_mocks.go b/mocks/aws/scim_mocks.go index c031cb11..1ec96fb0 100644 --- a/mocks/aws/scim_mocks.go +++ b/mocks/aws/scim_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: scim.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/aws/scim_mocks.go -source=scim.go HTTPClient +// // Package mocks is a generated GoMock package. package mocks @@ -8,13 +13,14 @@ import ( http "net/http" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockHTTPClient is a mock of HTTPClient interface. type MockHTTPClient struct { ctrl *gomock.Controller recorder *MockHTTPClientMockRecorder + isgomock struct{} } // MockHTTPClientMockRecorder is the mock recorder for MockHTTPClient. @@ -44,7 +50,7 @@ func (m *MockHTTPClient) Do(req *http.Request) (*http.Response, error) { } // Do indicates an expected call of Do. -func (mr *MockHTTPClientMockRecorder) Do(req interface{}) *gomock.Call { +func (mr *MockHTTPClientMockRecorder) Do(req any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Do", reflect.TypeOf((*MockHTTPClient)(nil).Do), req) } diff --git a/mocks/aws/secretsmanager_mocks.go b/mocks/aws/secretsmanager_mocks.go index a9c44e85..3cd1f4fa 100644 --- a/mocks/aws/secretsmanager_mocks.go +++ b/mocks/aws/secretsmanager_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: secretsmanager.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/aws/secretsmanager_mocks.go -source=secretsmanager.go SecretsManagerClientAPI +// // Package mocks is a generated GoMock package. package mocks @@ -9,13 +14,14 @@ import ( reflect "reflect" secretsmanager "github.com/aws/aws-sdk-go-v2/service/secretsmanager" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockSecretsManagerClientAPI is a mock of SecretsManagerClientAPI interface. type MockSecretsManagerClientAPI struct { ctrl *gomock.Controller recorder *MockSecretsManagerClientAPIMockRecorder + isgomock struct{} } // MockSecretsManagerClientAPIMockRecorder is the mock recorder for MockSecretsManagerClientAPI. @@ -38,7 +44,7 @@ func (m *MockSecretsManagerClientAPI) EXPECT() *MockSecretsManagerClientAPIMockR // GetSecretValue mocks base method. func (m *MockSecretsManagerClientAPI) GetSecretValue(ctx context.Context, params *secretsmanager.GetSecretValueInput, optFns ...func(*secretsmanager.Options)) (*secretsmanager.GetSecretValueOutput, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, params} + varargs := []any{ctx, params} for _, a := range optFns { varargs = append(varargs, a) } @@ -49,8 +55,8 @@ func (m *MockSecretsManagerClientAPI) GetSecretValue(ctx context.Context, params } // GetSecretValue indicates an expected call of GetSecretValue. -func (mr *MockSecretsManagerClientAPIMockRecorder) GetSecretValue(ctx, params interface{}, optFns ...interface{}) *gomock.Call { +func (mr *MockSecretsManagerClientAPIMockRecorder) GetSecretValue(ctx, params any, optFns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, params}, optFns...) + varargs := append([]any{ctx, params}, optFns...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSecretValue", reflect.TypeOf((*MockSecretsManagerClientAPI)(nil).GetSecretValue), varargs...) } diff --git a/mocks/core/idp_mocks.go b/mocks/core/idp_mocks.go index ff2ef362..7ed3ca58 100644 --- a/mocks/core/idp_mocks.go +++ b/mocks/core/idp_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: idp.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/core/idp_mocks.go -source=idp.go +// // Package mocks is a generated GoMock package. package mocks @@ -8,14 +13,15 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" model "github.com/slashdevops/idp-scim-sync/internal/model" + gomock "go.uber.org/mock/gomock" ) // MockIdentityProviderService is a mock of IdentityProviderService interface. type MockIdentityProviderService struct { ctrl *gomock.Controller recorder *MockIdentityProviderServiceMockRecorder + isgomock struct{} } // MockIdentityProviderServiceMockRecorder is the mock recorder for MockIdentityProviderService. @@ -45,7 +51,7 @@ func (m *MockIdentityProviderService) GetGroupMembers(ctx context.Context, id st } // GetGroupMembers indicates an expected call of GetGroupMembers. -func (mr *MockIdentityProviderServiceMockRecorder) GetGroupMembers(ctx, id interface{}) *gomock.Call { +func (mr *MockIdentityProviderServiceMockRecorder) GetGroupMembers(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroupMembers", reflect.TypeOf((*MockIdentityProviderService)(nil).GetGroupMembers), ctx, id) } @@ -60,7 +66,7 @@ func (m *MockIdentityProviderService) GetGroups(ctx context.Context, filter []st } // GetGroups indicates an expected call of GetGroups. -func (mr *MockIdentityProviderServiceMockRecorder) GetGroups(ctx, filter interface{}) *gomock.Call { +func (mr *MockIdentityProviderServiceMockRecorder) GetGroups(ctx, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroups", reflect.TypeOf((*MockIdentityProviderService)(nil).GetGroups), ctx, filter) } @@ -75,7 +81,7 @@ func (m *MockIdentityProviderService) GetGroupsMembers(ctx context.Context, gr * } // GetGroupsMembers indicates an expected call of GetGroupsMembers. -func (mr *MockIdentityProviderServiceMockRecorder) GetGroupsMembers(ctx, gr interface{}) *gomock.Call { +func (mr *MockIdentityProviderServiceMockRecorder) GetGroupsMembers(ctx, gr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroupsMembers", reflect.TypeOf((*MockIdentityProviderService)(nil).GetGroupsMembers), ctx, gr) } @@ -90,7 +96,7 @@ func (m *MockIdentityProviderService) GetUsers(ctx context.Context, filter []str } // GetUsers indicates an expected call of GetUsers. -func (mr *MockIdentityProviderServiceMockRecorder) GetUsers(ctx, filter interface{}) *gomock.Call { +func (mr *MockIdentityProviderServiceMockRecorder) GetUsers(ctx, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsers", reflect.TypeOf((*MockIdentityProviderService)(nil).GetUsers), ctx, filter) } @@ -105,7 +111,7 @@ func (m *MockIdentityProviderService) GetUsersByGroupsMembers(ctx context.Contex } // GetUsersByGroupsMembers indicates an expected call of GetUsersByGroupsMembers. -func (mr *MockIdentityProviderServiceMockRecorder) GetUsersByGroupsMembers(ctx, gmr interface{}) *gomock.Call { +func (mr *MockIdentityProviderServiceMockRecorder) GetUsersByGroupsMembers(ctx, gmr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsersByGroupsMembers", reflect.TypeOf((*MockIdentityProviderService)(nil).GetUsersByGroupsMembers), ctx, gmr) } diff --git a/mocks/core/repository_mocks.go b/mocks/core/repository_mocks.go index e3d69f46..ab5250df 100644 --- a/mocks/core/repository_mocks.go +++ b/mocks/core/repository_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: repository.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/core/repository_mocks.go -source=repository.go +// // Package mocks is a generated GoMock package. package mocks @@ -8,14 +13,15 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" model "github.com/slashdevops/idp-scim-sync/internal/model" + gomock "go.uber.org/mock/gomock" ) // MockStateRepository is a mock of StateRepository interface. type MockStateRepository struct { ctrl *gomock.Controller recorder *MockStateRepositoryMockRecorder + isgomock struct{} } // MockStateRepositoryMockRecorder is the mock recorder for MockStateRepository. @@ -45,7 +51,7 @@ func (m *MockStateRepository) GetState(ctx context.Context) (*model.State, error } // GetState indicates an expected call of GetState. -func (mr *MockStateRepositoryMockRecorder) GetState(ctx interface{}) *gomock.Call { +func (mr *MockStateRepositoryMockRecorder) GetState(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetState", reflect.TypeOf((*MockStateRepository)(nil).GetState), ctx) } @@ -59,7 +65,7 @@ func (m *MockStateRepository) SetState(ctx context.Context, state *model.State) } // SetState indicates an expected call of SetState. -func (mr *MockStateRepositoryMockRecorder) SetState(ctx, state interface{}) *gomock.Call { +func (mr *MockStateRepositoryMockRecorder) SetState(ctx, state any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetState", reflect.TypeOf((*MockStateRepository)(nil).SetState), ctx, state) } diff --git a/mocks/core/scim_mocks.go b/mocks/core/scim_mocks.go index 450f9bf0..079de517 100644 --- a/mocks/core/scim_mocks.go +++ b/mocks/core/scim_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: scim.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/core/scim_mocks.go -source=scim.go +// // Package mocks is a generated GoMock package. package mocks @@ -8,14 +13,15 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" model "github.com/slashdevops/idp-scim-sync/internal/model" + gomock "go.uber.org/mock/gomock" ) // MockSCIMService is a mock of SCIMService interface. type MockSCIMService struct { ctrl *gomock.Controller recorder *MockSCIMServiceMockRecorder + isgomock struct{} } // MockSCIMServiceMockRecorder is the mock recorder for MockSCIMService. @@ -45,7 +51,7 @@ func (m *MockSCIMService) CreateGroups(ctx context.Context, gr *model.GroupsResu } // CreateGroups indicates an expected call of CreateGroups. -func (mr *MockSCIMServiceMockRecorder) CreateGroups(ctx, gr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) CreateGroups(ctx, gr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateGroups", reflect.TypeOf((*MockSCIMService)(nil).CreateGroups), ctx, gr) } @@ -60,7 +66,7 @@ func (m *MockSCIMService) CreateGroupsMembers(ctx context.Context, gmr *model.Gr } // CreateGroupsMembers indicates an expected call of CreateGroupsMembers. -func (mr *MockSCIMServiceMockRecorder) CreateGroupsMembers(ctx, gmr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) CreateGroupsMembers(ctx, gmr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateGroupsMembers", reflect.TypeOf((*MockSCIMService)(nil).CreateGroupsMembers), ctx, gmr) } @@ -75,7 +81,7 @@ func (m *MockSCIMService) CreateUsers(ctx context.Context, ur *model.UsersResult } // CreateUsers indicates an expected call of CreateUsers. -func (mr *MockSCIMServiceMockRecorder) CreateUsers(ctx, ur interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) CreateUsers(ctx, ur any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUsers", reflect.TypeOf((*MockSCIMService)(nil).CreateUsers), ctx, ur) } @@ -89,7 +95,7 @@ func (m *MockSCIMService) DeleteGroups(ctx context.Context, gr *model.GroupsResu } // DeleteGroups indicates an expected call of DeleteGroups. -func (mr *MockSCIMServiceMockRecorder) DeleteGroups(ctx, gr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) DeleteGroups(ctx, gr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteGroups", reflect.TypeOf((*MockSCIMService)(nil).DeleteGroups), ctx, gr) } @@ -103,7 +109,7 @@ func (m *MockSCIMService) DeleteGroupsMembers(ctx context.Context, gmr *model.Gr } // DeleteGroupsMembers indicates an expected call of DeleteGroupsMembers. -func (mr *MockSCIMServiceMockRecorder) DeleteGroupsMembers(ctx, gmr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) DeleteGroupsMembers(ctx, gmr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteGroupsMembers", reflect.TypeOf((*MockSCIMService)(nil).DeleteGroupsMembers), ctx, gmr) } @@ -117,7 +123,7 @@ func (m *MockSCIMService) DeleteUsers(ctx context.Context, ur *model.UsersResult } // DeleteUsers indicates an expected call of DeleteUsers. -func (mr *MockSCIMServiceMockRecorder) DeleteUsers(ctx, ur interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) DeleteUsers(ctx, ur any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUsers", reflect.TypeOf((*MockSCIMService)(nil).DeleteUsers), ctx, ur) } @@ -132,7 +138,7 @@ func (m *MockSCIMService) GetGroups(ctx context.Context) (*model.GroupsResult, e } // GetGroups indicates an expected call of GetGroups. -func (mr *MockSCIMServiceMockRecorder) GetGroups(ctx interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) GetGroups(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroups", reflect.TypeOf((*MockSCIMService)(nil).GetGroups), ctx) } @@ -147,7 +153,7 @@ func (m *MockSCIMService) GetGroupsMembers(ctx context.Context, gr *model.Groups } // GetGroupsMembers indicates an expected call of GetGroupsMembers. -func (mr *MockSCIMServiceMockRecorder) GetGroupsMembers(ctx, gr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) GetGroupsMembers(ctx, gr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroupsMembers", reflect.TypeOf((*MockSCIMService)(nil).GetGroupsMembers), ctx, gr) } @@ -162,7 +168,7 @@ func (m *MockSCIMService) GetGroupsMembersBruteForce(ctx context.Context, gr *mo } // GetGroupsMembersBruteForce indicates an expected call of GetGroupsMembersBruteForce. -func (mr *MockSCIMServiceMockRecorder) GetGroupsMembersBruteForce(ctx, gr, ur interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) GetGroupsMembersBruteForce(ctx, gr, ur any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroupsMembersBruteForce", reflect.TypeOf((*MockSCIMService)(nil).GetGroupsMembersBruteForce), ctx, gr, ur) } @@ -177,7 +183,7 @@ func (m *MockSCIMService) GetUsers(ctx context.Context) (*model.UsersResult, err } // GetUsers indicates an expected call of GetUsers. -func (mr *MockSCIMServiceMockRecorder) GetUsers(ctx interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) GetUsers(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsers", reflect.TypeOf((*MockSCIMService)(nil).GetUsers), ctx) } @@ -192,7 +198,7 @@ func (m *MockSCIMService) UpdateGroups(ctx context.Context, gr *model.GroupsResu } // UpdateGroups indicates an expected call of UpdateGroups. -func (mr *MockSCIMServiceMockRecorder) UpdateGroups(ctx, gr interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) UpdateGroups(ctx, gr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateGroups", reflect.TypeOf((*MockSCIMService)(nil).UpdateGroups), ctx, gr) } @@ -207,7 +213,7 @@ func (m *MockSCIMService) UpdateUsers(ctx context.Context, ur *model.UsersResult } // UpdateUsers indicates an expected call of UpdateUsers. -func (mr *MockSCIMServiceMockRecorder) UpdateUsers(ctx, ur interface{}) *gomock.Call { +func (mr *MockSCIMServiceMockRecorder) UpdateUsers(ctx, ur any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateUsers", reflect.TypeOf((*MockSCIMService)(nil).UpdateUsers), ctx, ur) } diff --git a/mocks/idp/idp_mocks.go b/mocks/idp/idp_mocks.go index 4ec4f788..9b3ce1e4 100644 --- a/mocks/idp/idp_mocks.go +++ b/mocks/idp/idp_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: idp.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/idp/idp_mocks.go -source=idp.go GoogleProviderService +// // Package mocks is a generated GoMock package. package mocks @@ -8,8 +13,8 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" google "github.com/slashdevops/idp-scim-sync/pkg/google" + gomock "go.uber.org/mock/gomock" admin "google.golang.org/api/admin/directory/v1" ) @@ -17,6 +22,7 @@ import ( type MockGoogleProviderService struct { ctrl *gomock.Controller recorder *MockGoogleProviderServiceMockRecorder + isgomock struct{} } // MockGoogleProviderServiceMockRecorder is the mock recorder for MockGoogleProviderService. @@ -46,7 +52,7 @@ func (m *MockGoogleProviderService) GetUser(ctx context.Context, userID string) } // GetUser indicates an expected call of GetUser. -func (mr *MockGoogleProviderServiceMockRecorder) GetUser(ctx, userID interface{}) *gomock.Call { +func (mr *MockGoogleProviderServiceMockRecorder) GetUser(ctx, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockGoogleProviderService)(nil).GetUser), ctx, userID) } @@ -54,7 +60,7 @@ func (mr *MockGoogleProviderServiceMockRecorder) GetUser(ctx, userID interface{} // ListGroupMembers mocks base method. func (m *MockGoogleProviderService) ListGroupMembers(ctx context.Context, groupID string, queries ...google.GetGroupMembersOption) ([]*admin.Member, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, groupID} + varargs := []any{ctx, groupID} for _, a := range queries { varargs = append(varargs, a) } @@ -65,9 +71,9 @@ func (m *MockGoogleProviderService) ListGroupMembers(ctx context.Context, groupI } // ListGroupMembers indicates an expected call of ListGroupMembers. -func (mr *MockGoogleProviderServiceMockRecorder) ListGroupMembers(ctx, groupID interface{}, queries ...interface{}) *gomock.Call { +func (mr *MockGoogleProviderServiceMockRecorder) ListGroupMembers(ctx, groupID any, queries ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, groupID}, queries...) + varargs := append([]any{ctx, groupID}, queries...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListGroupMembers", reflect.TypeOf((*MockGoogleProviderService)(nil).ListGroupMembers), varargs...) } @@ -81,7 +87,7 @@ func (m *MockGoogleProviderService) ListGroups(ctx context.Context, query []stri } // ListGroups indicates an expected call of ListGroups. -func (mr *MockGoogleProviderServiceMockRecorder) ListGroups(ctx, query interface{}) *gomock.Call { +func (mr *MockGoogleProviderServiceMockRecorder) ListGroups(ctx, query any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListGroups", reflect.TypeOf((*MockGoogleProviderService)(nil).ListGroups), ctx, query) } @@ -96,7 +102,7 @@ func (m *MockGoogleProviderService) ListUsers(ctx context.Context, query []strin } // ListUsers indicates an expected call of ListUsers. -func (mr *MockGoogleProviderServiceMockRecorder) ListUsers(ctx, query interface{}) *gomock.Call { +func (mr *MockGoogleProviderServiceMockRecorder) ListUsers(ctx, query any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListUsers", reflect.TypeOf((*MockGoogleProviderService)(nil).ListUsers), ctx, query) } diff --git a/mocks/repository/repository_mocks.go b/mocks/repository/repository_mocks.go index 3367534d..805adc47 100644 --- a/mocks/repository/repository_mocks.go +++ b/mocks/repository/repository_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: repository.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/repository/repository_mocks.go -source=repository.go +// // Package mocks is a generated GoMock package. package mocks @@ -9,13 +14,14 @@ import ( reflect "reflect" s3 "github.com/aws/aws-sdk-go-v2/service/s3" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MockS3ClientAPI is a mock of S3ClientAPI interface. type MockS3ClientAPI struct { ctrl *gomock.Controller recorder *MockS3ClientAPIMockRecorder + isgomock struct{} } // MockS3ClientAPIMockRecorder is the mock recorder for MockS3ClientAPI. @@ -38,7 +44,7 @@ func (m *MockS3ClientAPI) EXPECT() *MockS3ClientAPIMockRecorder { // GetObject mocks base method. func (m *MockS3ClientAPI) GetObject(ctx context.Context, params *s3.GetObjectInput, optFns ...func(*s3.Options)) (*s3.GetObjectOutput, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, params} + varargs := []any{ctx, params} for _, a := range optFns { varargs = append(varargs, a) } @@ -49,16 +55,16 @@ func (m *MockS3ClientAPI) GetObject(ctx context.Context, params *s3.GetObjectInp } // GetObject indicates an expected call of GetObject. -func (mr *MockS3ClientAPIMockRecorder) GetObject(ctx, params interface{}, optFns ...interface{}) *gomock.Call { +func (mr *MockS3ClientAPIMockRecorder) GetObject(ctx, params any, optFns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, params}, optFns...) + varargs := append([]any{ctx, params}, optFns...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetObject", reflect.TypeOf((*MockS3ClientAPI)(nil).GetObject), varargs...) } // PutObject mocks base method. func (m *MockS3ClientAPI) PutObject(ctx context.Context, params *s3.PutObjectInput, optFns ...func(*s3.Options)) (*s3.PutObjectOutput, error) { m.ctrl.T.Helper() - varargs := []interface{}{ctx, params} + varargs := []any{ctx, params} for _, a := range optFns { varargs = append(varargs, a) } @@ -69,8 +75,8 @@ func (m *MockS3ClientAPI) PutObject(ctx context.Context, params *s3.PutObjectInp } // PutObject indicates an expected call of PutObject. -func (mr *MockS3ClientAPIMockRecorder) PutObject(ctx, params interface{}, optFns ...interface{}) *gomock.Call { +func (mr *MockS3ClientAPIMockRecorder) PutObject(ctx, params any, optFns ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{ctx, params}, optFns...) + varargs := append([]any{ctx, params}, optFns...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutObject", reflect.TypeOf((*MockS3ClientAPI)(nil).PutObject), varargs...) } diff --git a/mocks/scim/scim_mocks.go b/mocks/scim/scim_mocks.go index 279a7fe8..f0f3c2e3 100644 --- a/mocks/scim/scim_mocks.go +++ b/mocks/scim/scim_mocks.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: scim.go +// +// Generated by this command: +// +// mockgen -package=mocks -destination=../../mocks/scim/scim_mocks.go -source=scim.go AWSSCIMProvider +// // Package mocks is a generated GoMock package. package mocks @@ -8,14 +13,15 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" aws "github.com/slashdevops/idp-scim-sync/pkg/aws" + gomock "go.uber.org/mock/gomock" ) // MockAWSSCIMProvider is a mock of AWSSCIMProvider interface. type MockAWSSCIMProvider struct { ctrl *gomock.Controller recorder *MockAWSSCIMProviderMockRecorder + isgomock struct{} } // MockAWSSCIMProviderMockRecorder is the mock recorder for MockAWSSCIMProvider. @@ -45,7 +51,7 @@ func (m *MockAWSSCIMProvider) CreateOrGetGroup(ctx context.Context, g *aws.Creat } // CreateOrGetGroup indicates an expected call of CreateOrGetGroup. -func (mr *MockAWSSCIMProviderMockRecorder) CreateOrGetGroup(ctx, g interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) CreateOrGetGroup(ctx, g any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrGetGroup", reflect.TypeOf((*MockAWSSCIMProvider)(nil).CreateOrGetGroup), ctx, g) } @@ -60,7 +66,7 @@ func (m *MockAWSSCIMProvider) CreateOrGetUser(ctx context.Context, u *aws.Create } // CreateOrGetUser indicates an expected call of CreateOrGetUser. -func (mr *MockAWSSCIMProviderMockRecorder) CreateOrGetUser(ctx, u interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) CreateOrGetUser(ctx, u any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrGetUser", reflect.TypeOf((*MockAWSSCIMProvider)(nil).CreateOrGetUser), ctx, u) } @@ -74,7 +80,7 @@ func (m *MockAWSSCIMProvider) DeleteGroup(ctx context.Context, id string) error } // DeleteGroup indicates an expected call of DeleteGroup. -func (mr *MockAWSSCIMProviderMockRecorder) DeleteGroup(ctx, id interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) DeleteGroup(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteGroup", reflect.TypeOf((*MockAWSSCIMProvider)(nil).DeleteGroup), ctx, id) } @@ -88,7 +94,7 @@ func (m *MockAWSSCIMProvider) DeleteUser(ctx context.Context, id string) error { } // DeleteUser indicates an expected call of DeleteUser. -func (mr *MockAWSSCIMProviderMockRecorder) DeleteUser(ctx, id interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) DeleteUser(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUser", reflect.TypeOf((*MockAWSSCIMProvider)(nil).DeleteUser), ctx, id) } @@ -103,7 +109,7 @@ func (m *MockAWSSCIMProvider) GetUser(ctx context.Context, userID string) (*aws. } // GetUser indicates an expected call of GetUser. -func (mr *MockAWSSCIMProviderMockRecorder) GetUser(ctx, userID interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) GetUser(ctx, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockAWSSCIMProvider)(nil).GetUser), ctx, userID) } @@ -118,7 +124,7 @@ func (m *MockAWSSCIMProvider) GetUserByUserName(ctx context.Context, userName st } // GetUserByUserName indicates an expected call of GetUserByUserName. -func (mr *MockAWSSCIMProviderMockRecorder) GetUserByUserName(ctx, userName interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) GetUserByUserName(ctx, userName any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserByUserName", reflect.TypeOf((*MockAWSSCIMProvider)(nil).GetUserByUserName), ctx, userName) } @@ -133,7 +139,7 @@ func (m *MockAWSSCIMProvider) ListGroups(ctx context.Context, filter string) (*a } // ListGroups indicates an expected call of ListGroups. -func (mr *MockAWSSCIMProviderMockRecorder) ListGroups(ctx, filter interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) ListGroups(ctx, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListGroups", reflect.TypeOf((*MockAWSSCIMProvider)(nil).ListGroups), ctx, filter) } @@ -148,7 +154,7 @@ func (m *MockAWSSCIMProvider) ListUsers(ctx context.Context, filter string) (*aw } // ListUsers indicates an expected call of ListUsers. -func (mr *MockAWSSCIMProviderMockRecorder) ListUsers(ctx, filter interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) ListUsers(ctx, filter any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListUsers", reflect.TypeOf((*MockAWSSCIMProvider)(nil).ListUsers), ctx, filter) } @@ -162,7 +168,7 @@ func (m *MockAWSSCIMProvider) PatchGroup(ctx context.Context, pgr *aws.PatchGrou } // PatchGroup indicates an expected call of PatchGroup. -func (mr *MockAWSSCIMProviderMockRecorder) PatchGroup(ctx, pgr interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) PatchGroup(ctx, pgr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PatchGroup", reflect.TypeOf((*MockAWSSCIMProvider)(nil).PatchGroup), ctx, pgr) } @@ -177,7 +183,7 @@ func (m *MockAWSSCIMProvider) PutUser(ctx context.Context, usr *aws.PutUserReque } // PutUser indicates an expected call of PutUser. -func (mr *MockAWSSCIMProviderMockRecorder) PutUser(ctx, usr interface{}) *gomock.Call { +func (mr *MockAWSSCIMProviderMockRecorder) PutUser(ctx, usr any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutUser", reflect.TypeOf((*MockAWSSCIMProvider)(nil).PutUser), ctx, usr) } diff --git a/pkg/aws/scim.go b/pkg/aws/scim.go index e25ccbed..623bbbb3 100644 --- a/pkg/aws/scim.go +++ b/pkg/aws/scim.go @@ -54,7 +54,7 @@ var ( ErrBearerTokenEmpty = errors.Errorf("aws: bearer token may not be empty") ) -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/aws/scim_mocks.go -source=scim.go HTTPClient +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/aws/scim_mocks.go -source=scim.go HTTPClient // HTTPClient is an interface for sending HTTP requests. type HTTPClient interface { diff --git a/pkg/aws/scim_test.go b/pkg/aws/scim_test.go index 87fca5a6..adadb1d9 100644 --- a/pkg/aws/scim_test.go +++ b/pkg/aws/scim_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/golang/mock/gomock" mocks "github.com/slashdevops/idp-scim-sync/mocks/aws" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) type mockErrReader int diff --git a/pkg/aws/secretsmanager.go b/pkg/aws/secretsmanager.go index f1342401..8de2078b 100644 --- a/pkg/aws/secretsmanager.go +++ b/pkg/aws/secretsmanager.go @@ -17,7 +17,7 @@ var ErrSecretManagerClientNil = errors.New("aws: AWS SecretsManager Client canno // https://aws.github.io/aws-sdk-go-v2/docs/unit-testing/ -//go:generate go run github.com/golang/mock/mockgen@v1.6.0 -package=mocks -destination=../../mocks/aws/secretsmanager_mocks.go -source=secretsmanager.go SecretsManagerClientAPI +//go:generate go run go.uber.org/mock/mockgen@v0.5.0 -package=mocks -destination=../../mocks/aws/secretsmanager_mocks.go -source=secretsmanager.go SecretsManagerClientAPI // SecretsManagerClientAPI is the interface to consume the secretsmanager client methods. type SecretsManagerClientAPI interface { diff --git a/pkg/aws/secretsmanager_test.go b/pkg/aws/secretsmanager_test.go index 4e1e4d6d..67d00418 100644 --- a/pkg/aws/secretsmanager_test.go +++ b/pkg/aws/secretsmanager_test.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/secretsmanager" - "github.com/golang/mock/gomock" mocks "github.com/slashdevops/idp-scim-sync/mocks/aws" "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" ) func TestNewSecretsManagerService(t *testing.T) {