Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Rename tf to jet #3

Merged
merged 4 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ linters-settings:
goimports:
# put imports beginning with prefix after 3rd-party packages;
# it's a comma-separated list of prefixes
local-prefixes: github.com/crossplane-contrib/provider-tf-gcp
local-prefixes: github.com/crossplane-contrib/provider-jet-gcp

gocyclo:
# minimal code complexity to report, 30 by default (but we recommend 10-20)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====================================================================================
# Setup Project

PROJECT_NAME := provider-tf-gcp
PROJECT_NAME := provider-jet-gcp
PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)

export TERRAFORM_VERSION := 1.0.11
Expand Down Expand Up @@ -50,7 +50,7 @@ GO111MODULE = on
# Setup Images

DOCKER_REGISTRY := crossplane
IMAGES = provider-tf-gcp provider-tf-gcp-controller
IMAGES = provider-jet-gcp provider-jet-gcp-controller
-include build/makelib/image.mk

# ====================================================================================
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Terrajet GCP Provider

`provider-tf-gcp` is a [Crossplane](https://crossplane.io/) provider that
`provider-jet-gcp` is a [Crossplane](https://crossplane.io/) provider that
is built using [Terrajet](https://github.com/crossplane-contrib/terrajet) code
generation tools and exposes XRM-conformant managed resources for the
GCP API.

## Getting Started

Install the provider by using the following command after changing the image tag
to the [latest release](https://github.com/crossplane-contrib/provider-tf-gcp/releases):
to the [latest release](https://github.com/crossplane-contrib/provider-jet-gcp/releases):
```
kubectl crossplane install provider crossplane/provider-tf-gcp:v0.1.0
kubectl crossplane install provider crossplane/provider-jet-gcp:v0.1.0
```

You can see the API reference [here](https://doc.crds.dev/github.com/crossplane-contrib/provider-tf-gcp).
You can see the API reference [here](https://doc.crds.dev/github.com/crossplane-contrib/provider-jet-gcp).

## Developing

Expand Down Expand Up @@ -55,7 +55,7 @@ make build
## Report a Bug

For filing bugs, suggesting improvements, or requesting new features, please
open an [issue](https://github.com/crossplane-contrib/provider-tf-gcp/issues).
open an [issue](https://github.com/crossplane-contrib/provider-jet-gcp/issues).

## Contact

Expand All @@ -69,17 +69,17 @@ Please use the following to reach members of the community:

## Governance and Owners

provider-tf-gcp is run according to the same
provider-jet-gcp is run according to the same
[Governance](https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md)
and [Ownership](https://github.com/crossplane/crossplane/blob/master/OWNERS.md)
structure as the core Crossplane project.

## Code of Conduct

provider-tf-gcp adheres to the same [Code of
provider-jet-gcp adheres to the same [Code of
Conduct](https://github.com/crossplane/crossplane/blob/master/CODE_OF_CONDUCT.md)
as the core Crossplane project.

## Licensing

provider-tf-gcp is under the Apache 2.0 license.
provider-jet-gcp is under the Apache 2.0 license.
2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_address_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/compute/v1alpha1/zz_firewall_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_generated.resolvers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/compute/v1alpha1/zz_groupversion_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_instance_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_managedsslcertificate_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_network_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/compute/v1alpha1/zz_router_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/compute/v1alpha1/zz_routernat_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/compute/v1alpha1/zz_subnetwork_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/storage/v1alpha1/zz_bucket_types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/storage/v1alpha1/zz_groupversion_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ limitations under the License.

// Package v1alpha1 contains the core resources of the tf gcp provider.
// +kubebuilder:object:generate=true
// +groupName=gcp.tf.crossplane.io
// +groupName=gcp.jet.crossplane.io
// +versionName=v1alpha1
package v1alpha1
2 changes: 1 addition & 1 deletion apis/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

// Package type metadata.
const (
Group = "gcp.tf.crossplane.io"
Group = "gcp.jet.crossplane.io"
Version = "v1alpha1"
)

Expand Down
6 changes: 3 additions & 3 deletions apis/zz_register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include ../../../build/makelib/common.mk

# ====================================================================================
# Options
IMAGE = $(BUILD_REGISTRY)/provider-tf-gcp-controller-$(ARCH)
IMAGE = $(BUILD_REGISTRY)/provider-jet-gcp-controller-$(ARCH)
include ../../../build/makelib/image.mk

# ====================================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include ../../../build/makelib/common.mk
# ====================================================================================
# Options
DOCKER_REGISTRY ?= crossplane
IMAGE = $(BUILD_REGISTRY)/provider-tf-gcp-$(ARCH)
IMAGE = $(BUILD_REGISTRY)/provider-jet-gcp-$(ARCH)
OSBASEIMAGE = scratch
include ../../../build/makelib/image.mk

Expand Down
2 changes: 1 addition & 1 deletion cmd/generator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/crossplane-contrib/terrajet/pkg/pipeline"

"github.com/crossplane-contrib/provider-tf-gcp/config"
"github.com/crossplane-contrib/provider-jet-gcp/config"
)

func main() {
Expand Down
12 changes: 6 additions & 6 deletions cmd/provider/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

"github.com/crossplane-contrib/provider-tf-gcp/apis"
pconfig "github.com/crossplane-contrib/provider-tf-gcp/config"
"github.com/crossplane-contrib/provider-tf-gcp/internal/clients"
"github.com/crossplane-contrib/provider-tf-gcp/internal/controller"
"github.com/crossplane-contrib/provider-jet-gcp/apis"
pconfig "github.com/crossplane-contrib/provider-jet-gcp/config"
"github.com/crossplane-contrib/provider-jet-gcp/internal/clients"
"github.com/crossplane-contrib/provider-jet-gcp/internal/controller"
)

func main() {
Expand All @@ -46,7 +46,7 @@ func main() {
kingpin.MustParse(app.Parse(os.Args[1:]))

zl := zap.New(zap.UseDevMode(*debug))
log := logging.NewLogrLogger(zl.WithName("provider-tf-gcp"))
log := logging.NewLogrLogger(zl.WithName("provider-jet-gcp"))
if *debug {
// The controller-runtime runs with a no-op logger by default. It is
// *very* verbose even at info level, so we only provide it a real
Expand All @@ -61,7 +61,7 @@ func main() {

mgr, err := ctrl.NewManager(cfg, ctrl.Options{
LeaderElection: *leaderElection,
LeaderElectionID: "crossplane-leader-election-provider-tf-gcp",
LeaderElectionID: "crossplane-leader-election-provider-jet-gcp",
SyncPeriod: syncPeriod,
})
kingpin.FatalIfError(err, "Cannot create controller manager")
Expand Down
2 changes: 1 addition & 1 deletion config/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

const (
// SelfPackagePath is the golang path for this package.
SelfPackagePath = "github.com/crossplane-contrib/provider-tf-gcp/config/common"
SelfPackagePath = "github.com/crossplane-contrib/provider-jet-gcp/config/common"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/compute/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/crossplane-contrib/terrajet/pkg/config"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

"github.com/crossplane-contrib/provider-tf-gcp/config/common"
"github.com/crossplane-contrib/provider-jet-gcp/config/common"
)

// Configure configures individual resources by adding custom
Expand Down
24 changes: 12 additions & 12 deletions config/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ import (
tf "github.com/hashicorp/terraform-provider-google/google"
"github.com/iancoleman/strcase"

"github.com/crossplane-contrib/provider-tf-gcp/config/accessapproval"
"github.com/crossplane-contrib/provider-tf-gcp/config/cloudfunctions"
"github.com/crossplane-contrib/provider-tf-gcp/config/cloudiot"
"github.com/crossplane-contrib/provider-tf-gcp/config/cloudplatform"
"github.com/crossplane-contrib/provider-tf-gcp/config/compute"
"github.com/crossplane-contrib/provider-tf-gcp/config/dataflow"
"github.com/crossplane-contrib/provider-tf-gcp/config/dataproc"
"github.com/crossplane-contrib/provider-tf-gcp/config/project"
"github.com/crossplane-contrib/provider-tf-gcp/config/storage"
"github.com/crossplane-contrib/provider-jet-gcp/config/accessapproval"
"github.com/crossplane-contrib/provider-jet-gcp/config/cloudfunctions"
"github.com/crossplane-contrib/provider-jet-gcp/config/cloudiot"
"github.com/crossplane-contrib/provider-jet-gcp/config/cloudplatform"
"github.com/crossplane-contrib/provider-jet-gcp/config/compute"
"github.com/crossplane-contrib/provider-jet-gcp/config/dataflow"
"github.com/crossplane-contrib/provider-jet-gcp/config/dataproc"
"github.com/crossplane-contrib/provider-jet-gcp/config/project"
"github.com/crossplane-contrib/provider-jet-gcp/config/storage"
)

const (
resourcePrefix = "gcp"
modulePath = "github.com/crossplane-contrib/provider-tf-gcp"
modulePath = "github.com/crossplane-contrib/provider-jet-gcp"
)

var skipList = []string{
Expand Down Expand Up @@ -52,8 +52,8 @@ func GetProvider() *tjconfig.Provider {
resourceMap := tf.Provider().ResourcesMap
pc := tjconfig.NewProvider(resourceMap, resourcePrefix, modulePath,
tjconfig.WithDefaultResourceFn(gcpDefaultResourceFn),
tjconfig.WithGroupSuffix("gcp.tf.crossplane.io"),
tjconfig.WithShortName("tfgcp"),
tjconfig.WithGroupSuffix("gcp.jet.crossplane.io"),
tjconfig.WithShortName("gcpjet"),
// Comment out the following line to generate all resources.
tjconfig.WithIncludeList(includeList),
tjconfig.WithSkipList(skipList))
Expand Down
2 changes: 1 addition & 1 deletion examples/providerconfig/providerconfig.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: gcp.tf.crossplane.io/v1alpha1
apiVersion: gcp.jet.crossplane.io/v1alpha1
kind: ProviderConfig
metadata:
name: default
Expand Down
2 changes: 1 addition & 1 deletion examples/storage/bucket.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: storage.gcp.tf.crossplane.io/v1alpha1
apiVersion: storage.gcp.jet.crossplane.io/v1alpha1
kind: Bucket
metadata:
name: example
Expand Down
Loading