From 48f56faf65cf378eabc5fd2e3e80094d2d9db9ed Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Thu, 16 Oct 2025 09:55:51 +0800 Subject: [PATCH 1/3] update dependencies and rename to sil-org --- cmd/cli/multiregion/dns.go | 2 +- cmd/cli/multiregion/failover.go | 2 +- cmd/cli/multiregion/multiregion.go | 2 +- cmd/cli/multiregion/setup.go | 2 +- cmd/cli/multiregion/status.go | 2 +- cmd/cli/root.go | 6 +- go.mod | 46 ++++++--------- go.sum | 94 +++++++++++++----------------- 8 files changed, 68 insertions(+), 88 deletions(-) diff --git a/cmd/cli/multiregion/dns.go b/cmd/cli/multiregion/dns.go index 6c07d40..2902ec5 100644 --- a/cmd/cli/multiregion/dns.go +++ b/cmd/cli/multiregion/dns.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/silinternational/idp-cli/cmd/cli/flags" + "github.com/sil-org/idp-cli/cmd/cli/flags" ) type DnsCommand struct { diff --git a/cmd/cli/multiregion/failover.go b/cmd/cli/multiregion/failover.go index 933e6bd..a9ae774 100644 --- a/cmd/cli/multiregion/failover.go +++ b/cmd/cli/multiregion/failover.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/silinternational/tfc-ops/v3/lib" + "github.com/sil-org/tfc-ops/v5/lib" "github.com/spf13/cobra" ) diff --git a/cmd/cli/multiregion/multiregion.go b/cmd/cli/multiregion/multiregion.go index 06c209e..a6bd386 100644 --- a/cmd/cli/multiregion/multiregion.go +++ b/cmd/cli/multiregion/multiregion.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/silinternational/idp-cli/cmd/cli/flags" + "github.com/sil-org/idp-cli/cmd/cli/flags" ) const envProd = "prod" diff --git a/cmd/cli/multiregion/setup.go b/cmd/cli/multiregion/setup.go index 3472fc5..dcd58a8 100644 --- a/cmd/cli/multiregion/setup.go +++ b/cmd/cli/multiregion/setup.go @@ -9,7 +9,7 @@ import ( "log" "strings" - "github.com/silinternational/tfc-ops/v3/lib" + "github.com/sil-org/tfc-ops/v5/lib" "github.com/spf13/cobra" ) diff --git a/cmd/cli/multiregion/status.go b/cmd/cli/multiregion/status.go index ae40e20..f3049d5 100644 --- a/cmd/cli/multiregion/status.go +++ b/cmd/cli/multiregion/status.go @@ -8,7 +8,7 @@ import ( "fmt" "log" - "github.com/silinternational/tfc-ops/v3/lib" + "github.com/sil-org/tfc-ops/v5/lib" "github.com/spf13/cobra" ) diff --git a/cmd/cli/root.go b/cmd/cli/root.go index fcd3bcd..9123fa6 100644 --- a/cmd/cli/root.go +++ b/cmd/cli/root.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/silinternational/idp-cli/cmd/cli/flags" - "github.com/silinternational/idp-cli/cmd/cli/multiregion" + "github.com/sil-org/idp-cli/cmd/cli/flags" + "github.com/sil-org/idp-cli/cmd/cli/multiregion" ) const requiredPrefix = "required - " @@ -23,7 +23,7 @@ func Execute() { rootCmd := &cobra.Command{ Use: "idp-cli", Short: "idp-in-a-box CLI", - Long: `idp is a CLI tool for the silinternational/idp-in-a-box system. + Long: `idp is a CLI tool for the sil-org/idp-in-a-box system. It can be used to check the status of the IdP. It can also be used to establish secondary resources in a second AWS region, and to initiate a secondary region failover action.`, } diff --git a/go.mod b/go.mod index 3950ce5..899ad94 100644 --- a/go.mod +++ b/go.mod @@ -1,38 +1,30 @@ -module github.com/silinternational/idp-cli +module github.com/sil-org/idp-cli -go 1.23 -toolchain go1.24.1 +go 1.25 require ( - github.com/cloudflare/cloudflare-go v0.108.0 - github.com/silinternational/tfc-ops/v3 v3.5.4 - github.com/spf13/cobra v1.8.1 - github.com/spf13/viper v1.19.0 + github.com/cloudflare/cloudflare-go v0.116.0 + github.com/sil-org/tfc-ops/v5 v5.0.0 + github.com/spf13/cobra v1.10.1 + github.com/spf13/viper v1.21.0 ) require ( github.com/Jeffail/gabs/v2 v2.7.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/goccy/go-json v0.10.3 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/magiconair/properties v1.8.7 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/pelletier/go-toml/v2 v2.2.3 // indirect - github.com/sagikazarmark/locafero v0.6.0 // indirect - github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/cast v1.7.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/sagikazarmark/locafero v0.12.0 // indirect + github.com/spf13/afero v1.15.0 // indirect + github.com/spf13/cast v1.10.0 // indirect + github.com/spf13/pflag v1.0.10 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect - golang.org/x/net v0.38.0 // indirect - golang.org/x/sys v0.31.0 // indirect - golang.org/x/text v0.23.0 // indirect - golang.org/x/time v0.7.0 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect + golang.org/x/time v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 3515fb4..a5498ac 100644 --- a/go.sum +++ b/go.sum @@ -1,80 +1,68 @@ github.com/Jeffail/gabs/v2 v2.7.0 h1:Y2edYaTcE8ZpRsR2AtmPu5xQdFDIthFG0jYhu5PY8kg= github.com/Jeffail/gabs/v2 v2.7.0/go.mod h1:dp5ocw1FvBBQYssgHsG7I1WYsiLRtkUaB1FEtSwvNUw= -github.com/cloudflare/cloudflare-go v0.108.0 h1:C4Skfjd8I8X3uEOGmQUT4/iGyZcWdkIU7HwvMoLkEE0= -github.com/cloudflare/cloudflare-go v0.108.0/go.mod h1:m492eNahT/9MsN7Ppnoge8AaI7QhVFtEgVm3I9HJFeU= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cloudflare/cloudflare-go v0.116.0 h1:iRPMnTtnswRpELO65NTwMX4+RTdxZl+Xf/zi+HPE95s= +github.com/cloudflare/cloudflare-go v0.116.0/go.mod h1:Ds6urDwn/TF2uIU24mu7H91xkKP8gSAHxQ44DSZgVmU= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= -github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= -github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= -github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= -github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= -github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= -github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/silinternational/tfc-ops/v3 v3.5.4 h1:8JHZPTBTiTHlR/tn7Eky1NepWtAjgox4CR13v8I34vM= -github.com/silinternational/tfc-ops/v3 v3.5.4/go.mod h1:9/X/KB5XJ5m+F2TO28UBBM3TWbIZ3x91DvQGBKPmwlY= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= -github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= -github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= -github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= -github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= -github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4= +github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI= +github.com/sil-org/tfc-ops/v5 v5.0.0 h1:V1q6+uLF+LelKh4GjShQSlyQb9u5mRrYUhUci+HN8u8= +github.com/sil-org/tfc-ops/v5 v5.0.0/go.mod h1:71UDfoPTbLTOHMptdmJtHdYgPbC2OI120rqhyZ4YiWk= +github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= +github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= +github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= +github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= +github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU= +github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -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/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= -golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= +golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From fd28efa80c563b254edccfe206cbe3fa9e653f83 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Thu, 16 Oct 2025 10:09:38 +0800 Subject: [PATCH 2/3] use lib.Var instead of lib.TFVar, which was removed in tfc-ops v4 --- cmd/cli/multiregion/setup.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/cli/multiregion/setup.go b/cmd/cli/multiregion/setup.go index dcd58a8..093cc10 100644 --- a/cmd/cli/multiregion/setup.go +++ b/cmd/cli/multiregion/setup.go @@ -145,28 +145,28 @@ func setWorkspaceProperties(pFlags PersistentFlags, workspace string) { func setMultiregionVariables(pFlags PersistentFlags) { fmt.Println("\nSetting variables...") - tfRemoteClusterSecondary := lib.TFVar{Key: "tf_remote_cluster_secondary", Value: pFlags.org + "/" + clusterSecondaryWorkspace(pFlags)} - tfRemoteDatabase := lib.TFVar{Key: "tf_remote_database", Value: pFlags.org + "/" + databaseWorkspace(pFlags)} - tfRemoteDatabaseSecondary := lib.TFVar{Key: "tf_remote_database_secondary", Value: pFlags.org + "/" + databaseSecondaryWorkspace(pFlags)} - tfRemoteBrokerSecondary := lib.TFVar{Key: "tf_remote_broker_secondary", Value: pFlags.org + "/" + brokerSecondaryWorkspace(pFlags)} - tfRemotePwManagerSecondary := lib.TFVar{Key: "tf_remote_pwmanager_secondary", Value: pFlags.org + "/" + pwSecondaryWorkspace(pFlags)} - tfRemoteSsp := lib.TFVar{Key: "tf_remote_simplesamlphp", Value: pFlags.org + "/" + sspWorkspace(pFlags)} + tfRemoteClusterSecondary := lib.Var{Key: "tf_remote_cluster_secondary", Value: pFlags.org + "/" + clusterSecondaryWorkspace(pFlags)} + tfRemoteDatabase := lib.Var{Key: "tf_remote_database", Value: pFlags.org + "/" + databaseWorkspace(pFlags)} + tfRemoteDatabaseSecondary := lib.Var{Key: "tf_remote_database_secondary", Value: pFlags.org + "/" + databaseSecondaryWorkspace(pFlags)} + tfRemoteBrokerSecondary := lib.Var{Key: "tf_remote_broker_secondary", Value: pFlags.org + "/" + brokerSecondaryWorkspace(pFlags)} + tfRemotePwManagerSecondary := lib.Var{Key: "tf_remote_pwmanager_secondary", Value: pFlags.org + "/" + pwSecondaryWorkspace(pFlags)} + tfRemoteSsp := lib.Var{Key: "tf_remote_simplesamlphp", Value: pFlags.org + "/" + sspWorkspace(pFlags)} // Set variables in primary workspaces that also point to secondary workspaces - coreVars := []lib.TFVar{ + coreVars := []lib.Var{ {Key: "aws_create_secondary", Value: "true"}, {Key: "aws_region_secondary", Value: pFlags.secondaryRegion}, } setVars(pFlags, coreWorkspace(pFlags), coreVars) - backupVars := []lib.TFVar{ + backupVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, } setVars(pFlags, backupWorkspace(pFlags), backupVars) - brokerSearchVars := []lib.TFVar{ + brokerSearchVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteBrokerSecondary, } @@ -174,39 +174,39 @@ func setMultiregionVariables(pFlags PersistentFlags) { // Set variables in the new secondary workspaces - clusterVars := []lib.TFVar{ + clusterVars := []lib.Var{ {Key: "aws_zones", Value: getZonesHCL(pFlags.secondaryRegion), Hcl: true}, } setVars(pFlags, clusterSecondaryWorkspace(pFlags), clusterVars) - databaseVars := []lib.TFVar{ + databaseVars := []lib.Var{ {Key: "availability_zone", Value: pFlags.secondaryRegion + "a"}, // TODO: make this work in all regions tfRemoteClusterSecondary, tfRemoteDatabase, } setVars(pFlags, databaseSecondaryWorkspace(pFlags), databaseVars) - pmaVars := []lib.TFVar{ + pmaVars := []lib.Var{ {Key: "pma_subdomain", Value: pFlags.idp + "-pma-secondary"}, tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, } setVars(pFlags, pmaSecondaryWorkspace(pFlags), pmaVars) - brokerVars := []lib.TFVar{ + brokerVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, } setVars(pFlags, brokerSecondaryWorkspace(pFlags), brokerVars) - pwVars := []lib.TFVar{ + pwVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, tfRemoteBrokerSecondary, } setVars(pFlags, pwSecondaryWorkspace(pFlags), pwVars) - sspVars := []lib.TFVar{ + sspVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteDatabaseSecondary, tfRemoteBrokerSecondary, @@ -215,7 +215,7 @@ func setMultiregionVariables(pFlags PersistentFlags) { } setVars(pFlags, sspSecondaryWorkspace(pFlags), sspVars) - syncVars := []lib.TFVar{ + syncVars := []lib.Var{ tfRemoteClusterSecondary, tfRemoteBrokerSecondary, } @@ -286,7 +286,7 @@ func setSensitiveVariables(pFlags PersistentFlags) { } // setVars sets a list of variables using the current variable values to decide whether to update or create -func setVars(pFlags PersistentFlags, workspace string, newVars []lib.TFVar) { +func setVars(pFlags PersistentFlags, workspace string, newVars []lib.Var) { currentVars, err := lib.GetVarsFromWorkspace(pFlags.org, workspace) if err != nil { log.Fatalf("failed to get the variables from %q", workspace) @@ -298,7 +298,7 @@ func setVars(pFlags PersistentFlags, workspace string, newVars []lib.TFVar) { } // setVar sets a variable using the list of current variables to decide whether to update or create -func setVar(pFlags PersistentFlags, vars []lib.Var, workspace string, tfVar lib.TFVar) { +func setVar(pFlags PersistentFlags, vars []lib.Var, workspace string, tfVar lib.Var) { if v := findVar(vars, tfVar.Key); v == nil { fmt.Printf("%s - creating var.%s with value %q\n", workspace, tfVar.Key, tfVar.Value) if !pFlags.readOnlyMode { From 16d0436fc1e4f84e672a483b8e8e28463fb8482e Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Thu, 16 Oct 2025 10:29:52 +0800 Subject: [PATCH 3/3] convert one more TFVar to Var --- cmd/cli/multiregion/failover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/cli/multiregion/failover.go b/cmd/cli/multiregion/failover.go index a9ae774..006c50f 100644 --- a/cmd/cli/multiregion/failover.go +++ b/cmd/cli/multiregion/failover.go @@ -131,7 +131,7 @@ func (f *Failover) setVariable(workspaceKey, variableKey, value string) { return } - lib.UpdateVariable(f.tfcOrg, f.workspaces[workspaceKey].Attributes.Name, v.ID, lib.TFVar{ + lib.UpdateVariable(f.tfcOrg, f.workspaces[workspaceKey].Attributes.Name, v.ID, lib.Var{ Key: variableKey, Value: value, })