Skip to content

Commit

Permalink
github release
Browse files Browse the repository at this point in the history
Change-Id: Ie254dc10cc92592ca609f18bf92aedf8f8711e18
  • Loading branch information
sergeylanzman committed May 1, 2019
1 parent d645ff7 commit 06b90b0
Show file tree
Hide file tree
Showing 71 changed files with 134 additions and 78 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ Flags:
1. Google cloud
2. AWS

#### Permissions

Readonly permissions

## How to use Terraformer

### Installation
Expand Down Expand Up @@ -181,7 +185,7 @@ For GCP compute resources, use generated code from
To regenerate code:

```
go run gcp_terraforming/compute_resources/gcp_compute_code_generator/*.go
go run gcp_terraforming/gcp_compute_code_generator/*.go
```

### Similar projects
Expand Down
3 changes: 2 additions & 1 deletion aws_terraforming/alb.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package aws_terraforming
import (
"fmt"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/hashicorp/terraform/helper/resource"

Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/autoscaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/service/autoscaling"
"github.com/aws/aws-sdk-go/service/ec2"
Expand Down
3 changes: 2 additions & 1 deletion aws_terraforming/aws_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package aws_terraforming

import (
"os"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/aws_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package aws_terraforming

import "waze/terraformer/terraform_utils"
import "github.com/GoogleCloudPlatform/terraformer/terraform_utils"

type AWSService struct {
terraform_utils.Service
Expand Down
3 changes: 2 additions & 1 deletion aws_terraforming/elasticache.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package aws_terraforming

import (
"strings"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/service/elasticache"

Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/elb.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/iam.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"strings"

"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/service/iam"

Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/igw.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/nacl.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
3 changes: 2 additions & 1 deletion aws_terraforming/rds.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package aws_terraforming

import (
"strings"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/service/rds"

Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/route53.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"strings"

"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
3 changes: 2 additions & 1 deletion aws_terraforming/s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package aws_terraforming
import (
"fmt"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws/awserr"

Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/sg.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"log"
"strings"

"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/subnet.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/vgw.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/vpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
2 changes: 1 addition & 1 deletion aws_terraforming/vpn_connetion.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package aws_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down
3 changes: 2 additions & 1 deletion cmd/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ package cmd

import (
"log"
"waze/terraformer/aws_terraforming"

"github.com/GoogleCloudPlatform/terraformer/aws_terraforming"

"github.com/spf13/cobra"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/google.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package cmd
import (
"log"
"strings"
"waze/terraformer/gcp_terraforming"

"github.com/GoogleCloudPlatform/terraformer/gcp_terraforming"

"github.com/spf13/cobra"
)
Expand Down
5 changes: 3 additions & 2 deletions cmd/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ import (
"os"
"sort"
"strings"
"waze/terraformer/terraform_utils"
"waze/terraformer/terraform_utils/terraform_output"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils/terraform_output"

"github.com/spf13/cobra"
)
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/addresses.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/autoscalers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/backendBuckets.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/backendServices.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
2 changes: 1 addition & 1 deletion gcp_terraforming/clouddns.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"strings"

"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/dns/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/cloudsql.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package gcp_terraforming
import (
"context"
"net/http"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"

Expand Down
2 changes: 1 addition & 1 deletion gcp_terraforming/compute.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package gcp_terraforming

import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"
)

// Map of supported GCP compute service with code generate
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/disks.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/firewalls.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/forwardingRules.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
7 changes: 4 additions & 3 deletions gcp_terraforming/gcp_compute_code_generator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"
"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down Expand Up @@ -136,7 +137,7 @@ const computeTemplate = `
package gcp_terraforming
import (
"waze/terraformer/terraform_utils"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"
)
// Map of supported GCP compute service with code generate
Expand All @@ -149,7 +150,7 @@ var ComputeServices = map[string]terraform_utils.ServiceGenerator{
`

func main() {
computeAPIData, err := ioutil.ReadFile(os.Getenv("GOPATH") + "/src/google.golang.org/api/compute/v1/compute-api.json")
computeAPIData, err := ioutil.ReadFile("vendor/google.golang.org/api/compute/v1/compute-api.json") //TODO delete this hack
if err != nil {
log.Fatal(err)

Expand Down
2 changes: 1 addition & 1 deletion gcp_terraforming/gcp_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ package gcp_terraforming

import (
"errors"
"github.com/GoogleCloudPlatform/terraformer/terraform_utils"
"os"
"strings"
"waze/terraformer/terraform_utils"
)

const gcpProviderVersion = "~>2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion gcp_terraforming/gcp_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package gcp_terraforming

import "waze/terraformer/terraform_utils"
import "github.com/GoogleCloudPlatform/terraformer/terraform_utils"

type GCPService struct {
terraform_utils.Service
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/gcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
"context"
"fmt"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"cloud.google.com/go/storage"
"google.golang.org/api/iterator"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/gke.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
"context"
"fmt"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"

Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/globalAddresses.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
3 changes: 2 additions & 1 deletion gcp_terraforming/globalForwardingRules.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ package gcp_terraforming
import (
"context"
"log"
"waze/terraformer/terraform_utils"

"github.com/GoogleCloudPlatform/terraformer/terraform_utils"

"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
Expand Down
Loading

0 comments on commit 06b90b0

Please sign in to comment.