diff --git a/docs/go.mod b/docs/go.mod index 882f5f7..d351659 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -5,7 +5,7 @@ go 1.22.2 replace github.com/golingon/lingon => ../ require ( - github.com/golingon/lingon v0.0.0-00010101000000-000000000000 + github.com/golingon/lingon v0.0.0-20240416053339-0bf5a7f001ce github.com/hashicorp/hcl/v2 v2.20.1 github.com/hashicorp/terraform-json v0.21.0 github.com/rogpeppe/go-internal v1.12.0 diff --git a/docs/platypus2/cmd/bootstrap/bucket.go b/docs/platypus2/cmd/bootstrap/bucket.go index f39a13d..ad70aae 100644 --- a/docs/platypus2/cmd/bootstrap/bucket.go +++ b/docs/platypus2/cmd/bootstrap/bucket.go @@ -12,8 +12,8 @@ import ( "github.com/golingon/lingon/pkg/terra" "github.com/golingon/lingoneks/infra" - "github.com/golingon/lingoneks/out/aws" "github.com/golingon/lingoneks/terraclient" + aws "github.com/golingon/terraproviders/aws/5.45.0" ) const ( diff --git a/docs/platypus2/cmd/platypus/stacks.go b/docs/platypus2/cmd/platypus/stacks.go index ac719d3..13b782e 100644 --- a/docs/platypus2/cmd/platypus/stacks.go +++ b/docs/platypus2/cmd/platypus/stacks.go @@ -10,8 +10,8 @@ import ( "github.com/golingon/lingoneks/infra" "github.com/golingon/lingoneks/karpenter" - "github.com/golingon/lingoneks/out/aws" "github.com/golingon/lingoneks/terraclient" + aws "github.com/golingon/terraproviders/aws/5.45.0" "github.com/golingon/lingon/pkg/terra" ) diff --git a/docs/platypus2/generate.go b/docs/platypus2/generate.go deleted file mode 100644 index 3693311..0000000 --- a/docs/platypus2/generate.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2023 Volvo Car Corporation -// SPDX-License-Identifier: Apache-2.0 - -package main - -//go:generate echo "\n>>>> docs/platypus2: generating hashicorp/aws terra provider\n" -//go:generate go run -mod=readonly github.com/golingon/lingon/cmd/terragen -out ./out/aws -pkg github.com/golingon/lingon/docs/terraform/out/aws -clean -provider aws=hashicorp/aws:5.44.0 - -//go:generate echo "\n>>>> docs/platypus2: generating hashicorp/tls terra provider\n" -//go:generate go run -mod=readonly github.com/golingon/lingon/cmd/terragen -out ./out/tls -pkg github.com/golingon/lingon/docs/terraform/out/tls -clean -provider tls=hashicorp/tls:4.0.5 diff --git a/docs/platypus2/go.mod b/docs/platypus2/go.mod index 09e4b77..d9bab08 100644 --- a/docs/platypus2/go.mod +++ b/docs/platypus2/go.mod @@ -10,10 +10,10 @@ require ( github.com/ardanlabs/conf/v3 v3.1.7 github.com/aws/karpenter v0.29.2 github.com/aws/karpenter-core v0.32.9 - github.com/golingon/lingon v0.0.0-00010101000000-000000000000 - github.com/golingon/terra_tls v0.0.0-20240412065029-004d8973b97c + github.com/golingon/lingon v0.0.0-20240416053339-0bf5a7f001ce + github.com/golingon/terraproviders/aws/5.45.0 v0.0.0-20240416110925-4deecce434a2 + github.com/golingon/terraproviders/tls/4.0.5 v0.0.0-20240416110925-4deecce434a2 github.com/grafana/dashboard-linter v0.0.0-20230622143601-02e2cd156626 - github.com/hashicorp/hcl/v2 v2.20.1 github.com/hashicorp/terraform-exec v0.20.0 github.com/hashicorp/terraform-json v0.21.0 github.com/nats-io/nats.go v1.34.1 @@ -91,6 +91,7 @@ require ( github.com/googleapis/gax-go/v2 v2.12.3 // 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.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 diff --git a/docs/platypus2/go.sum b/docs/platypus2/go.sum index 3d4d5d8..8e1a7c8 100644 --- a/docs/platypus2/go.sum +++ b/docs/platypus2/go.sum @@ -166,8 +166,10 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golingon/terra_tls v0.0.0-20240412065029-004d8973b97c h1:9HhF/oFSptpg9lmXsJGXE3PBe8CAnWGcYkdY1vAXV3A= -github.com/golingon/terra_tls v0.0.0-20240412065029-004d8973b97c/go.mod h1:IPr5Pavvt7gG2WDKK7E/v0nNe+0fu5k+b3q0i/Vr6AA= +github.com/golingon/terraproviders/aws/5.45.0 v0.0.0-20240416110925-4deecce434a2 h1:1xMplDb2o/c5ybKXRbgZmw5yEOJR7pxSnWy4zvp8RT4= +github.com/golingon/terraproviders/aws/5.45.0 v0.0.0-20240416110925-4deecce434a2/go.mod h1:icDf8s0ek+Uu91mZXwAhnzWJkrF8jkAfZ2wYRnn549Q= +github.com/golingon/terraproviders/tls/4.0.5 v0.0.0-20240416110925-4deecce434a2 h1:rVusmfsrNlI0tHrfvldpxPY4jXQjYDzkUctYc3Pr//s= +github.com/golingon/terraproviders/tls/4.0.5 v0.0.0-20240416110925-4deecce434a2/go.mod h1:jwrIQm1bTGEOWDDW9S6bOLnS7LvshGdNGkYxjuV7U8A= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= diff --git a/docs/platypus2/infra/csi_ebs.go b/docs/platypus2/infra/csi_ebs.go index daaa0a3..1b9a4c2 100644 --- a/docs/platypus2/infra/csi_ebs.go +++ b/docs/platypus2/infra/csi_ebs.go @@ -5,10 +5,10 @@ package infra import ( "github.com/golingon/lingon/pkg/terra" - "github.com/golingon/lingoneks/out/aws/aws_eks_addon" - "github.com/golingon/lingoneks/out/aws/aws_iam_policy_document" - "github.com/golingon/lingoneks/out/aws/aws_iam_role" - "github.com/golingon/lingoneks/out/aws/aws_iam_role_policy_attachment" + "github.com/golingon/terraproviders/aws/5.45.0/aws_eks_addon" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_policy_document" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role_policy_attachment" ) type CSI struct { diff --git a/docs/platypus2/infra/eks.go b/docs/platypus2/infra/eks.go index 5269839..9fd6d16 100644 --- a/docs/platypus2/infra/eks.go +++ b/docs/platypus2/infra/eks.go @@ -7,14 +7,14 @@ import ( "fmt" "github.com/golingon/lingon/pkg/terra" - "github.com/golingon/lingoneks/out/aws/aws_eks_cluster" - "github.com/golingon/lingoneks/out/aws/aws_iam_openid_connect_provider" - "github.com/golingon/lingoneks/out/aws/aws_iam_policy_document" - "github.com/golingon/lingoneks/out/aws/aws_iam_role" - "github.com/golingon/lingoneks/out/aws/aws_iam_role_policy_attachment" - "github.com/golingon/lingoneks/out/aws/aws_security_group" - "github.com/golingon/lingoneks/out/aws/aws_security_group_rule" - "github.com/golingon/terra_tls/tls_certificate" + "github.com/golingon/terraproviders/aws/5.45.0/aws_eks_cluster" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_openid_connect_provider" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_policy_document" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role_policy_attachment" + "github.com/golingon/terraproviders/aws/5.45.0/aws_security_group" + "github.com/golingon/terraproviders/aws/5.45.0/aws_security_group_rule" + "github.com/golingon/terraproviders/tls/4.0.5/tls_certificate" ) var ( diff --git a/docs/platypus2/infra/eks_test.go b/docs/platypus2/infra/eks_test.go index 7162a96..d7c1ee0 100644 --- a/docs/platypus2/infra/eks_test.go +++ b/docs/platypus2/infra/eks_test.go @@ -11,7 +11,7 @@ import ( "github.com/golingon/lingon/pkg/terra" tu "github.com/golingon/lingon/pkg/testutil" - "github.com/golingon/lingoneks/out/aws" + aws "github.com/golingon/terraproviders/aws/5.45.0" "github.com/hashicorp/terraform-exec/tfexec" ) diff --git a/docs/platypus2/infra/s3.go b/docs/platypus2/infra/s3.go index 3aa3068..6a5a624 100644 --- a/docs/platypus2/infra/s3.go +++ b/docs/platypus2/infra/s3.go @@ -5,10 +5,10 @@ package infra import ( "github.com/golingon/lingon/pkg/terra" - "github.com/golingon/lingoneks/out/aws/aws_s3_bucket" - "github.com/golingon/lingoneks/out/aws/aws_s3_bucket_public_access_block" - "github.com/golingon/lingoneks/out/aws/aws_s3_bucket_server_side_encryption_configuration" - "github.com/golingon/lingoneks/out/aws/aws_s3_bucket_versioning" + "github.com/golingon/terraproviders/aws/5.45.0/aws_s3_bucket" + "github.com/golingon/terraproviders/aws/5.45.0/aws_s3_bucket_public_access_block" + "github.com/golingon/terraproviders/aws/5.45.0/aws_s3_bucket_server_side_encryption_configuration" + "github.com/golingon/terraproviders/aws/5.45.0/aws_s3_bucket_versioning" ) type Bucket struct { diff --git a/docs/platypus2/infra/vpc.go b/docs/platypus2/infra/vpc.go index dc6b6c4..a318576 100644 --- a/docs/platypus2/infra/vpc.go +++ b/docs/platypus2/infra/vpc.go @@ -7,14 +7,14 @@ import ( "fmt" "github.com/golingon/lingon/pkg/terra" - "github.com/golingon/lingoneks/out/aws/aws_eip" - "github.com/golingon/lingoneks/out/aws/aws_internet_gateway" - "github.com/golingon/lingoneks/out/aws/aws_nat_gateway" - "github.com/golingon/lingoneks/out/aws/aws_route" - "github.com/golingon/lingoneks/out/aws/aws_route_table" - "github.com/golingon/lingoneks/out/aws/aws_route_table_association" - "github.com/golingon/lingoneks/out/aws/aws_subnet" - "github.com/golingon/lingoneks/out/aws/aws_vpc" + "github.com/golingon/terraproviders/aws/5.45.0/aws_eip" + "github.com/golingon/terraproviders/aws/5.45.0/aws_internet_gateway" + "github.com/golingon/terraproviders/aws/5.45.0/aws_nat_gateway" + "github.com/golingon/terraproviders/aws/5.45.0/aws_route" + "github.com/golingon/terraproviders/aws/5.45.0/aws_route_table" + "github.com/golingon/terraproviders/aws/5.45.0/aws_route_table_association" + "github.com/golingon/terraproviders/aws/5.45.0/aws_subnet" + "github.com/golingon/terraproviders/aws/5.45.0/aws_vpc" ) type Opts struct { diff --git a/docs/platypus2/karpenter/infra.go b/docs/platypus2/karpenter/infra.go index 0a9ba19..318d60d 100644 --- a/docs/platypus2/karpenter/infra.go +++ b/docs/platypus2/karpenter/infra.go @@ -6,10 +6,10 @@ package karpenter import ( "fmt" - "github.com/golingon/lingoneks/out/aws/aws_iam_policy_document" - "github.com/golingon/lingoneks/out/aws/aws_iam_role" - "github.com/golingon/lingoneks/out/aws/aws_sqs_queue" - "github.com/golingon/lingoneks/out/aws/aws_sqs_queue_policy" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_policy_document" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role" + "github.com/golingon/terraproviders/aws/5.45.0/aws_sqs_queue" + "github.com/golingon/terraproviders/aws/5.45.0/aws_sqs_queue_policy" "github.com/golingon/lingon/pkg/terra" ) diff --git a/docs/platypus2/karpenter/infra_fargateprofile.go b/docs/platypus2/karpenter/infra_fargateprofile.go index f53b76b..a50cdfe 100644 --- a/docs/platypus2/karpenter/infra_fargateprofile.go +++ b/docs/platypus2/karpenter/infra_fargateprofile.go @@ -6,10 +6,10 @@ package karpenter import ( "fmt" - "github.com/golingon/lingoneks/out/aws/aws_eks_fargate_profile" - "github.com/golingon/lingoneks/out/aws/aws_iam_policy_document" - "github.com/golingon/lingoneks/out/aws/aws_iam_role" - "github.com/golingon/lingoneks/out/aws/aws_iam_role_policy_attachment" + "github.com/golingon/terraproviders/aws/5.45.0/aws_eks_fargate_profile" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_policy_document" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role_policy_attachment" "github.com/golingon/lingon/pkg/terra" ) diff --git a/docs/platypus2/karpenter/infra_instanceprofile.go b/docs/platypus2/karpenter/infra_instanceprofile.go index 93fc5f8..6d861ba 100644 --- a/docs/platypus2/karpenter/infra_instanceprofile.go +++ b/docs/platypus2/karpenter/infra_instanceprofile.go @@ -6,10 +6,10 @@ package karpenter import ( "fmt" - "github.com/golingon/lingoneks/out/aws/aws_iam_instance_profile" - "github.com/golingon/lingoneks/out/aws/aws_iam_policy_document" - "github.com/golingon/lingoneks/out/aws/aws_iam_role" - "github.com/golingon/lingoneks/out/aws/aws_iam_role_policy_attachment" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_instance_profile" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_policy_document" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role" + "github.com/golingon/terraproviders/aws/5.45.0/aws_iam_role_policy_attachment" "github.com/golingon/lingon/pkg/terra" )