Skip to content

Commit d4670e8

Browse files
authored
Merge pull request #441 from slashdevops/feat-update
feat: update
2 parents 7cac115 + c1ed180 commit d4670e8

File tree

11 files changed

+137
-126
lines changed

11 files changed

+137
-126
lines changed

Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,25 @@ AWS_SAM_ARCH ?= arm64
6060
# MAKE_DEBUG=true make <target> will print the command
6161
# MAKE_STOP_ON_ERRORS=true make any fail will stop the execution if the command fails, this is useful for CI
6262
# NOTE: if the command has a > it will print the output into the original redirect of the command
63-
MAKE_STOP_ON_ERRORS := false
64-
MAKE_DEBUG := false
63+
MAKE_STOP_ON_ERRORS ?= false
64+
MAKE_DEBUG ?= false
6565

6666
define exec_cmd
6767
$(if $(filter $(MAKE_DEBUG),true),\
6868
${1} \
6969
, \
7070
$(if $(filter $(MAKE_STOP_ON_ERRORS),true),\
71-
@ERROR_OCCURRED=0; ${1} > /dev/null || ERROR_OCCURRED=1; if [ $$ERROR_OCCURRED -eq 0 ]; then printf " 🤞 ${1} ✅\n"; else printf " ${1} ❌ 🖕\n"; exit 1; fi \
71+
@${1} > /dev/null && printf " 🤞 ${1} ✅\n" || (printf " ${1} ❌ 🖕\n"; exit 1) \
7272
, \
7373
$(if $(findstring >, $1),\
74-
@${1} 2>/dev/null && printf " 🤞 ${1} ✅\n" || printf " ${1} ❌ 🖕\n" \
74+
@${1} 2>/dev/null; _exit_code=$$?; if [ $$_exit_code -eq 0 ]; then printf " 🤞 ${1} ✅\n"; else printf " ${1} ❌ 🖕\n"; fi; exit $$_exit_code \
7575
, \
76-
@${1} > /dev/null 2>&1 && printf ' 🤞 ${1} ✅\n' || printf ' ${1} ❌ 🖕\n' \
76+
@${1} > /dev/null 2>&1; _exit_code=$$?; if [ $$_exit_code -eq 0 ]; then printf ' 🤞 ${1} ✅\n'; else printf ' ${1} ❌ 🖕\n'; fi; exit $$_exit_code \
7777
) \
7878
) \
7979
)
8080

81-
endef # don't remove the white space at the end of the line
82-
# this is a function that will execute a command and print a message
81+
endef # don't remove the white line before endef
8382

8483
###############################################################################
8584
######## Targets ##############################################################

go.mod

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/slashdevops/idp-scim-sync
22

3-
go 1.25.0
3+
go 1.25.1
44

55
require (
66
github.com/aws/aws-lambda-go v1.49.0
7-
github.com/aws/aws-sdk-go-v2 v1.38.3
8-
github.com/aws/aws-sdk-go-v2/config v1.31.6
9-
github.com/aws/aws-sdk-go-v2/credentials v1.18.10
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3
11-
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2
7+
github.com/aws/aws-sdk-go-v2 v1.39.0
8+
github.com/aws/aws-sdk-go-v2/config v1.31.8
9+
github.com/aws/aws-sdk-go-v2/credentials v1.18.12
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
11+
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4
1212
github.com/google/go-cmp v0.7.0
1313
github.com/hashicorp/go-retryablehttp v0.7.8
1414
github.com/pkg/errors v0.9.1
1515
github.com/spf13/cobra v1.10.1
16-
github.com/spf13/viper v1.20.1
16+
github.com/spf13/viper v1.21.0
1717
github.com/stretchr/testify v1.11.1
1818
go.uber.org/mock v0.6.0
19-
golang.org/x/oauth2 v0.30.0
20-
golang.org/x/sync v0.16.0
21-
google.golang.org/api v0.248.0
19+
golang.org/x/oauth2 v0.31.0
20+
golang.org/x/sync v0.17.0
21+
google.golang.org/api v0.249.0
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
2424

@@ -27,18 +27,18 @@ require (
2727
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
2828
cloud.google.com/go/compute/metadata v0.8.0 // indirect
2929
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
30-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect
32-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect
30+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect
31+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
32+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
3333
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
34-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect
34+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect
3535
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect
4242
github.com/aws/smithy-go v1.23.0 // indirect
4343
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4444
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -54,22 +54,27 @@ require (
5454
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5555
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
5656
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
57-
github.com/sagikazarmark/locafero v0.10.0 // indirect
57+
github.com/sagikazarmark/locafero v0.11.0 // indirect
5858
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
59-
github.com/spf13/afero v1.14.0 // indirect
60-
github.com/spf13/cast v1.9.2 // indirect
61-
github.com/spf13/pflag v1.0.9 // indirect
59+
github.com/spf13/afero v1.15.0 // indirect
60+
github.com/spf13/cast v1.10.0 // indirect
61+
github.com/spf13/pflag v1.0.10 // indirect
6262
github.com/subosito/gotenv v1.6.0 // indirect
63-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
64-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
65-
go.opentelemetry.io/otel v1.37.0 // indirect
66-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
67-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
68-
golang.org/x/crypto v0.41.0 // indirect
69-
golang.org/x/net v0.43.0 // indirect
70-
golang.org/x/sys v0.35.0 // indirect
71-
golang.org/x/text v0.28.0 // indirect
72-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
73-
google.golang.org/grpc v1.75.0 // indirect
74-
google.golang.org/protobuf v1.36.8 // indirect
63+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
64+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
65+
go.opentelemetry.io/otel v1.38.0 // indirect
66+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
67+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
68+
go.yaml.in/yaml/v3 v3.0.4 // indirect
69+
golang.org/x/crypto v0.42.0 // indirect
70+
golang.org/x/mod v0.27.0 // indirect
71+
golang.org/x/net v0.44.0 // indirect
72+
golang.org/x/sys v0.36.0 // indirect
73+
golang.org/x/text v0.29.0 // indirect
74+
golang.org/x/tools v0.36.0 // indirect
75+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
76+
google.golang.org/grpc v1.75.1 // indirect
77+
google.golang.org/protobuf v1.36.9 // indirect
7578
)
79+
80+
tool go.uber.org/mock/mockgen

0 commit comments

Comments
 (0)