Adding AWS Athena, bumping aws-sdk-go-v2

docs/aws.md

@@ -61,6 +61,11 @@ terraformer import aws --resources=sg --regions=us-east-1
  * `aws_api_gateway_vpc_link`
 * `appsync`
  * `aws_appsync_graphql_api`
+* `athena`
+ * `aws_athena_data_catalog`
+ * `aws_athena_database`
+ * `aws_athena_named_query`
+ * `aws_athena_workgroup`
 * `auto_scaling`
  * `aws_autoscaling_group`
  * `aws_launch_configuration`

go.mod

@@ -26,13 +26,14 @@ require (
  github.com/aliyun/alibaba-cloud-sdk-go v1.61.1247
  github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible
  github.com/apache/openwhisk-client-go v0.0.0-20210106144548-17d556327cd3
- github.com/aws/aws-sdk-go-v2 v1.17.6
+ github.com/aws/aws-sdk-go-v2 v1.18.0
  github.com/aws/aws-sdk-go-v2/config v1.1.4
  github.com/aws/aws-sdk-go-v2/credentials v1.12.14
  github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.2.0
  github.com/aws/aws-sdk-go-v2/service/acm v1.2.1
  github.com/aws/aws-sdk-go-v2/service/apigateway v1.2.1
  github.com/aws/aws-sdk-go-v2/service/appsync v1.14.4
+ github.com/aws/aws-sdk-go-v2/service/athena v1.28.0
  github.com/aws/aws-sdk-go-v2/service/autoscaling v1.3.1
  github.com/aws/aws-sdk-go-v2/service/batch v1.3.1
  github.com/aws/aws-sdk-go-v2/service/budgets v1.9.0
@@ -210,8 +211,8 @@ require (
  github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
  github.com/aws/aws-sdk-go v1.37.0 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.12 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.3 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.1 // indirect
@@ -378,9 +379,7 @@ require (
 require (
  github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.5
  github.com/aws/aws-sdk-go-v2/service/medialive v1.24.2
-
  github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.16.5
- github.com/opalsecurity/opal-go v1.0.9
  github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.392
  github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.392
  github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.392

go.sum

@@ -259,6 +259,8 @@ github.com/aws/aws-sdk-go-v2 v1.16.16/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUY
 github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw=
 github.com/aws/aws-sdk-go-v2 v1.17.6 h1:Y773UK7OBqhzi5VDXMi1zVGsoj+CVHs2eaC2bDsLwi0=
 github.com/aws/aws-sdk-go-v2 v1.17.6/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
+github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY=
+github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
 github.com/aws/aws-sdk-go-v2/config v1.1.4 h1:2hjdDldmJJjb+rFieQySfOFt4WwxKZJVTEB6RBI74T4=
 github.com/aws/aws-sdk-go-v2/config v1.1.4/go.mod h1:op05ummoVoAqctpA80jVt/+hvEtLfuKmDyx0bIuvfbE=
 github.com/aws/aws-sdk-go-v2/credentials v1.1.4/go.mod h1:UQwsT2w2XelrWoVV2v/zL2uce1RxmVCiHaZsoKLamZg=
@@ -283,6 +285,8 @@ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23/go.mod h1:2DFxAQ9pfI
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25/go.mod h1:Zb29PYkf42vVYQY6pvSyJCJcFHlPIiY+YKdPtwnvMkY=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 h1:y+8n9AGDjikyXoMBTRaHHHSaFEB8267ykmvyPodJfys=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30/go.mod h1:LUBAO3zNXQjoONBKn/kR1y0Q4cj/D02Ts0uHYjcCQLM=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 h1:kG5eQilShqmJbv11XL1VpyDbaEJzWxd4zRiCG30GSn4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.1.0/go.mod h1:KdVvdk4gb7iatuHZgIkIqvJlWHBtjCJLUtD/uO/FkWw=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.2.0/go.mod h1:BsCSJHx5DnDXIrOcqB8KN1/B+hXLG/bi4Y6Vjcx/x9E=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.0/go.mod h1:viTrxhAuejD+LszDahzAE2x40YjYWhMqzHxv2ZiWaME=
@@ -299,6 +303,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17/go.mod h1:pRwaTYCJemA
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19/go.mod h1:6Q0546uHDp421okhmmGfbxzq2hBqbXFNpi4k+Q1JnQA=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 h1:r+Kv+SEJquhAZXaJ7G4u44cIwXV3f8K+N482NNAzJZA=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24/go.mod h1:gAuCezX/gob6BSMbItsSlMb6WZGV7K2+fWOvk8xBSto=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 h1:vFQlirhuM8lLlpI7imKOMsjdQLuN9CPi+k44F/OFVsk=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2 h1:d95cddM3yTm4qffj3P6EnP+TzX1SSkWaQypXSgT/hpA=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2/go.mod h1:BQV0agm+JEhqR+2RT5e1XTFIDcAAV0eW6z2trp+iduw=
 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.2.0 h1:G7NSCbvUWDp4B0ny7tjHfuZvadphb7M66/1cYN9AnAg=
@@ -309,6 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.2.1 h1:2kxNxcT9QVSckqagWevdNO
 github.com/aws/aws-sdk-go-v2/service/apigateway v1.2.1/go.mod h1:4fO3jaFTaz/8ygZBVNSk4NSdAwcc/NZ++HUrG9kpJ0I=
 github.com/aws/aws-sdk-go-v2/service/appsync v1.14.4 h1:HIuwaNjGn30p9lcM/RdgiWSG39pjo5nUClQwjrgcJik=
 github.com/aws/aws-sdk-go-v2/service/appsync v1.14.4/go.mod h1:8I0ugA1PropUiAA4y3Bou+tRZd+a2lAz/UhSJXMbmRk=
+github.com/aws/aws-sdk-go-v2/service/athena v1.28.0 h1:fG77b1smde0usA1F7hM6VX3wK+NagrFWdbFOUhS63RQ=
+github.com/aws/aws-sdk-go-v2/service/athena v1.28.0/go.mod h1:97btS9UBEnajlbXXJkaCAFIu1j3vfJKdQCnIhs853xY=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.3.1 h1:fQkypDE1Ll/W61tm8GoswgLjWfO8y1f50yXw5lA4uFo=
 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.3.1/go.mod h1:DVmOqpa3F7vhAuGfs2zse1f3N3mX64hCimRNSYiqnKE=
 github.com/aws/aws-sdk-go-v2/service/batch v1.3.1 h1:dZSRS8i4wL+lB87FCCHBynaD7BgrYyESuEzmx23/pOg=

providers/aws/athena.go

@@ -0,0 +1,139 @@
+// Copyright 2023 The Terraformer Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package aws
+
+import (
+ "context"
+
+ "github.com/GoogleCloudPlatform/terraformer/terraformutils"
+ "github.com/aws/aws-sdk-go-v2/service/athena"
+)
+
+var athenaAllowEmptyValues = []string{"tags."}
+
+type AthenaGenerator struct {
+ AWSService
+}
+
+func (g *AthenaGenerator) InitResources() error {
+ config, err := g.generateConfig()
+ if err != nil {
+ return err
+ }
+ svc := athena.NewFromConfig(config)
+ err = g.createWorkGroups(svc)
+ if err != nil {
+ return err
+ }
+ err = g.createDataCatalogs(svc)
+ if err != nil {
+ return err
+ }
+ err = g.createDatabase(svc)
+ if err != nil {
+ return err
+ }
+ err = g.createNamedQueries(svc)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (g *AthenaGenerator) createWorkGroups(svc *athena.Client) error {
+ p := athena.NewListWorkGroupsPaginator(svc, &athena.ListWorkGroupsInput{})
+ for p.HasMorePages() {
+ page, err := p.NextPage(context.TODO())
+ if err != nil {
+ return err
+ }
+
+ for _, workGroup := range page.WorkGroups {
+ g.Resources = append(g.Resources, terraformutils.NewSimpleResource(
+ *workGroup.Name,
+ *workGroup.Name,
+ "aws_athena_workgroup",
+ "aws",
+ athenaAllowEmptyValues))
+
+ }
+ }
+
+ return nil
+}
+
+func (g *AthenaGenerator) createDataCatalogs(svc *athena.Client) error {
+ p := athena.NewListDataCatalogsPaginator(svc, &athena.ListDataCatalogsInput{})
+ for p.HasMorePages() {
+ page, err := p.NextPage(context.Background())
+ if err != nil {
+ return err
+ }
+
+ for _, dataCatalog := range page.DataCatalogsSummary {
+ g.Resources = append(g.Resources, terraformutils.NewSimpleResource(
+ *dataCatalog.CatalogName,
+ *dataCatalog.CatalogName,
+ "aws_athena_data_catalog",
+ "aws",
+ athenaAllowEmptyValues))
+ }
+ }
+
+ return nil
+}
+
+func (g *AthenaGenerator) createDatabase(svc *athena.Client) error {
+ p := athena.NewListDatabasesPaginator(svc, &athena.ListDatabasesInput{})
+ for p.HasMorePages() {
+ page, err := p.NextPage(context.Background())
+ if err != nil {
+ return err
+ }
+
+ for _, database := range page.DatabaseList {
+ g.Resources = append(g.Resources, terraformutils.NewSimpleResource(
+ *database.Name,
+ *database.Name,
+ "aws_athena_database",
+ "aws",
+ athenaAllowEmptyValues))
+ }
+ }
+
+ return nil
+}
+
+func (g *AthenaGenerator) createNamedQueries(svc *athena.Client) error {
+ p := athena.NewListNamedQueriesPaginator(svc, &athena.ListNamedQueriesInput{})
+ for p.HasMorePages() {
+ page, err := p.NextPage(context.Background())
+ if err != nil {
+ return err
+ }
+
+ for _, namedQueryId := range page.NamedQueryIds {
+ g.Resources = append(g.Resources, terraformutils.NewSimpleResource(
+ namedQueryId,
+ namedQueryId,
+ "aws_athena_named_query",
+ "aws",
+ athenaAllowEmptyValues))
+ }
+ }
+
+ return nil
+}

providers/aws/aws_provider.go

@@ -243,6 +243,7 @@ func (p *AWSProvider) GetSupportedService() map[string]terraformutils.ServiceGen
  "alb": &AwsFacade{service: &AlbGenerator{}},
  "api_gateway": &AwsFacade{service: &APIGatewayGenerator{}},
  "appsync": &AwsFacade{service: &AppSyncGenerator{}},
+ "athena": &AwsFacade{service: &AthenaGenerator{}},
  "auto_scaling": &AwsFacade{service: &AutoScalingGenerator{}},
  "batch": &AwsFacade{service: &BatchGenerator{}},
  "budgets": &AwsFacade{service: &BudgetsGenerator{}},