update platypus2 to use terra-aws and terra_tls repositories

docs/platypus2/cmd/bootstrap/bucket.go

@@ -13,8 +13,7 @@ import (
 	"github.com/golingon/lingon/pkg/terra"
 	"github.com/golingon/lingoneks/infra"
 	"github.com/golingon/lingoneks/terraclient"
-	aws "github.com/golingon/terraproviders/aws/5.13.1"
-	"github.com/golingon/terraproviders/aws/5.13.1/provider"
+	aws "github.com/golingon/terra-aws"
 )
 
 const (
@@ -125,17 +124,15 @@ func run(p runParams) error {
 	s3 := s3Stack{
 		StackConfig: StackConfig{
 			Stack: terraclient.Stack{Name: bucketName},
-			Provider: aws.NewProvider(
-				aws.ProviderArgs{
-					Profile: S(p.AWSParams.Profile),
-					Region:  S(p.AWSParams.Region),
-					DefaultTags: []provider.DefaultTags{
-						{
-							Tags: infra.Ttags(p.TFLabels),
-						},
+			Provider: &aws.Provider{
+				Profile: S(p.AWSParams.Profile),
+				Region:  S(p.AWSParams.Region),
+				DefaultTags: []aws.DefaultTags{
+					{
+						Tags: infra.Ttags(p.TFLabels),
 					},
 				},
-			),
+			},
 		},
 		Bucket: *infra.NewBucket(bucketName),
 	}

docs/platypus2/cmd/platypus/stacks.go

@@ -11,8 +11,7 @@ import (
 	"github.com/golingon/lingoneks/infra"
 	"github.com/golingon/lingoneks/karpenter"
 	"github.com/golingon/lingoneks/terraclient"
-	aws "github.com/golingon/terraproviders/aws/5.13.1"
-	"github.com/golingon/terraproviders/aws/5.13.1/provider"
+	aws "github.com/golingon/terra-aws"
 
 	"github.com/golingon/lingon/pkg/terra"
 )
@@ -80,17 +79,15 @@ func newProv(p AWSParams, labels map[string]string) *aws.Provider {
 		l[k] = S(v)
 	}
 
-	return aws.NewProvider(
-		aws.ProviderArgs{
-			Profile: S(p.Profile),
-			Region:  S(p.Region),
-			DefaultTags: []provider.DefaultTags{
-				{
-					Tags: terra.Map(l),
-				},
+	return &aws.Provider{
+		Profile: S(p.Profile),
+		Region:  S(p.Region),
+		DefaultTags: []aws.DefaultTags{
+			{
+				Tags: terra.Map(l),
 			},
 		},
-	)
+	}
 }
 
 func kubeconfigFromAWSCmd(

docs/platypus2/go.mod

@@ -1,6 +1,6 @@
 module github.com/golingon/lingoneks
 
-go 1.21
+go 1.21.7
 
 replace github.com/golingon/lingon => ../../
 
@@ -10,29 +10,28 @@ require (
 	github.com/ardanlabs/conf/v3 v3.1.6
 	github.com/aws/karpenter v0.29.2
 	github.com/aws/karpenter-core v0.29.2
-	github.com/golingon/terraproviders/aws/5.13.1 v0.0.0-20230821062044-8717820dd713
-	github.com/golingon/terraproviders/tls/4.0.4 v0.0.0-20230821062044-8717820dd713
+	github.com/golingon/lingon v0.0.0-20240410151041-d6e1fef1f2a8
+	github.com/golingon/terra-aws v0.0.0-20240411092819-1b44e89cb239
+	github.com/golingon/terra_tls v0.0.0-20240411093921-49711ab41872
 	github.com/grafana/dashboard-linter v0.0.0-20230622143601-02e2cd156626
-	github.com/hashicorp/terraform-exec v0.18.1
-	github.com/hashicorp/terraform-json v0.17.1
+	github.com/hashicorp/terraform-exec v0.20.0
+	github.com/hashicorp/terraform-json v0.21.0
 	github.com/nats-io/nats.go v1.28.0
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.67.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/rogpeppe/go-internal v1.11.0
-	github.com/tidwall/gjson v1.16.0
-	github.com/golingon/lingon v0.0.0-20230821085204-81fbacc93e96
+	github.com/rogpeppe/go-internal v1.12.0
+	github.com/tidwall/gjson v1.17.1
 	github.com/zeitlinger/conflate v0.0.0-20230622100834-279724abda8c
 	go.uber.org/automaxprocs v1.5.3
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
-	k8s.io/api v0.28.0
-	k8s.io/apiextensions-apiserver v0.28.0
-	k8s.io/apimachinery v0.28.0
+	k8s.io/api v0.29.3
+	k8s.io/apiextensions-apiserver v0.29.3
+	k8s.io/apimachinery v0.29.3
 	k8s.io/client-go v1.5.2
 	k8s.io/kube-aggregator v0.28.0
 	sigs.k8s.io/kind v0.20.0
-	sigs.k8s.io/yaml v1.3.0
+	sigs.k8s.io/yaml v1.4.0
 )
 
 replace (
@@ -57,7 +56,7 @@ require (
 	github.com/VictoriaMetrics/metrics v1.24.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/alessio/shellescape v1.4.1 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/aws/aws-sdk-go v1.44.329 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
@@ -68,22 +67,22 @@ require (
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.15.1 // indirect
+	github.com/go-playground/validator/v10 v10.19.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.5 // indirect
 	github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
@@ -92,14 +91,14 @@ require (
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -134,21 +133,22 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/zclconf/go-cty v1.13.2 // indirect
+	github.com/zclconf/go-cty v1.14.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/goleak v1.2.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/oauth2 v0.11.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/api v0.138.0 // indirect
@@ -160,12 +160,12 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/component-base v0.28.0 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 // indirect
-	mvdan.cc/gofumpt v0.5.0 // indirect
+	mvdan.cc/gofumpt v0.6.0 // indirect
 	sigs.k8s.io/controller-runtime v0.16.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )