Merge pull request #265 from zzxwill/region

Change json tag of spec.Region to `customRegion` in Configuration

api/v1beta2/configuration_types.go

@@ -0,0 +1,131 @@
+/*
+Copyright 2021 The KubeVela 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 v1beta2
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	state "github.com/oam-dev/terraform-controller/api/types"
+	types "github.com/oam-dev/terraform-controller/api/types/crossplane-runtime"
+)
+
+// ConfigurationSpec defines the desired state of Configuration
+type ConfigurationSpec struct {
+	// JSON is the Terraform JSON syntax configuration.
+	// Deprecated: after v0.3.1, use HCL instead.
+	JSON string `json:"JSON,omitempty"`
+	// HCL is the Terraform HCL type configuration
+	HCL string `json:"hcl,omitempty"`
+
+	// Remote is a git repo which contains hcl files. Currently, only public git repos are supported.
+	Remote string `json:"remote,omitempty"`
+
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Variable *runtime.RawExtension `json:"variable,omitempty"`
+
+	// Backend stores the state in a Kubernetes secret with locking done using a Lease resource.
+	// TODO(zzxwill) If a backend exists in HCL/JSON, this can be optional. Currently, if Backend is not set by users, it
+	// still will set by the controller, ignoring the settings in HCL/JSON backend
+	Backend *Backend `json:"backend,omitempty"`
+
+	// Path is the sub-directory of remote git repository.
+	Path string `json:"path,omitempty"`
+
+	BaseConfigurationSpec `json:",inline"`
+}
+
+// BaseConfigurationSpec defines the common fields of a ConfigurationSpec
+type BaseConfigurationSpec struct {
+	// WriteConnectionSecretToReference specifies the namespace and name of a
+	// Secret to which any connection details for this managed resource should
+	// be written. Connection details frequently include the endpoint, username,
+	// and password required to connect to the managed resource.
+	// +optional
+	WriteConnectionSecretToReference *types.SecretReference `json:"writeConnectionSecretToRef,omitempty"`
+
+	// ProviderReference specifies the reference to Provider
+	ProviderReference *types.Reference `json:"providerRef,omitempty"`
+
+	// DeleteResource will determine whether provisioned cloud resources will be deleted when CR is deleted
+	// +kubebuilder:default:=true
+	DeleteResource bool `json:"deleteResource,omitempty"`
+
+	// Region is cloud provider's region. It will override the region in the region field of ProviderReference
+	Region string `json:"customRegion,omitempty"`
+}
+
+// ConfigurationStatus defines the observed state of Configuration
+type ConfigurationStatus struct {
+	Apply   ConfigurationApplyStatus   `json:"apply,omitempty"`
+	Destroy ConfigurationDestroyStatus `json:"destroy,omitempty"`
+}
+
+// ConfigurationApplyStatus is the status for Configuration apply
+type ConfigurationApplyStatus struct {
+	State   state.ConfigurationState `json:"state,omitempty"`
+	Message string                   `json:"message,omitempty"`
+	Outputs map[string]Property      `json:"outputs,omitempty"`
+}
+
+// ConfigurationDestroyStatus is the status for Configuration destroy
+type ConfigurationDestroyStatus struct {
+	State   state.ConfigurationState `json:"state,omitempty"`
+	Message string                   `json:"message,omitempty"`
+}
+
+// Property is the property for an output
+type Property struct {
+	Value string `json:"value,omitempty"`
+	Type  string `json:"type,omitempty"`
+}
+
+// Backend stores the state in a Kubernetes secret with locking done using a Lease resource.
+type Backend struct {
+	// SecretSuffix used when creating secrets. Secrets will be named in the format: tfstate-{workspace}-{secretSuffix}
+	SecretSuffix string `json:"secretSuffix,omitempty"`
+	// InClusterConfig Used to authenticate to the cluster from inside a pod. Only `true` is allowed
+	InClusterConfig bool `json:"inClusterConfig,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// Configuration is the Schema for the configurations API
+//+kubebuilder:storageversion
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="STATE",type="string",JSONPath=".status.apply.state"
+// +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
+type Configuration struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ConfigurationSpec   `json:"spec,omitempty"`
+	Status ConfigurationStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// ConfigurationList contains a list of Configuration
+type ConfigurationList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Configuration `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Configuration{}, &ConfigurationList{})
+}

api/v1beta2/groupversion_info.go

@@ -0,0 +1,36 @@
+/*
+
+
+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 v1beta2 contains API Schema definitions for the terraform v1beta2 API group
+// +kubebuilder:object:generate=true
+// +groupName=terraform.core.oam.dev
+package v1beta2
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects
+	GroupVersion = schema.GroupVersion{Group: "terraform.core.oam.dev", Version: "v1beta2"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)

chart/Chart.yaml

@@ -3,4 +3,4 @@ name: terraform-controller
 version: 0.2.8
 description: A Kubernetes Terraform controller
 home: https://github.com/oam-dev/terraform-controller
-appVersion: "0.2.7"
+appVersion: "0.3.0"