Skip to content

Commit

Permalink
lint action fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Fumigatus committed Oct 19, 2023
1 parent c3a94c1 commit 1d7f71f
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 46 deletions.
3 changes: 0 additions & 3 deletions apis/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ Copyright 2021 Upbound Inc.
//go:generate bash -c "find ../internal/controller -type d -empty -delete"
//go:generate rm -rf ../examples-generated

// Generate documentation from Terraform docs.
//go:generate go run github.com/upbound/upjet/cmd/scraper -n ${TERRAFORM_PROVIDER_SOURCE} -r ../.work/${TERRAFORM_PROVIDER_SOURCE}/${TERRAFORM_DOCS_PATH} -o ../config/provider-metadata.yaml

// Run Upjet generator
//go:generate go run ../cmd/generator/main.go ..

Expand Down
2 changes: 1 addition & 1 deletion config/block_device/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package blockDevice
package blockdevice

import "github.com/upbound/upjet/pkg/config"

Expand Down
2 changes: 1 addition & 1 deletion config/blueprint/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func Configure(p *config.Provider) {
r.ShortGroup = "blueprint"
r.Version = "v1alpha1"
r.References["blueprint_id"] = config.Reference{
Type: "Blueprint", //github.com/crossplane-contrib/provider-vra/apis/blueprint/v1alpha1.Blueprint
Type: "Blueprint", // github.com/crossplane-contrib/provider-vra/apis/blueprint/v1alpha1.Blueprint
}
})
}
2 changes: 1 addition & 1 deletion config/catalog_item/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package catalogItem
package catalogitem

import "github.com/upbound/upjet/pkg/config"

Expand Down
2 changes: 1 addition & 1 deletion config/catalog_source/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package catalogSource
package catalogsource

import "github.com/upbound/upjet/pkg/config"

Expand Down
33 changes: 18 additions & 15 deletions config/cloud_account/config.go
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
package cloudAccount
package cloudaccount

import "github.com/upbound/upjet/pkg/config"

const version string = "v1alpha1"
const shortGroup string = "cloudAccount"

// Configure configures individual resources by adding custom ResourceConfigurators.
func Configure(p *config.Provider) {
p.AddResourceConfigurator("vra_cloud_account_aws", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_azure", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_gcp", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_nsxt", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_nsxv", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_vmc", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})

p.AddResourceConfigurator("vra_cloud_account_vsphere", func(r *config.Resource) {
r.Version = "v1alpha1"
r.ShortGroup = "cloudAccount"
r.Version = version
r.ShortGroup = shortGroup
})
}
2 changes: 1 addition & 1 deletion config/content_source/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package contentSource
package contentsource

import "github.com/upbound/upjet/pkg/config"

Expand Down
2 changes: 1 addition & 1 deletion config/flavor_profile/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flavorProfile
package flavorprofile

import "github.com/upbound/upjet/pkg/config"

Expand Down
2 changes: 1 addition & 1 deletion config/image_profile/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package imageProfile
package imageprofile

import "github.com/upbound/upjet/pkg/config"

Expand Down
2 changes: 1 addition & 1 deletion config/load_balancer/config.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package loadBalancer
package loadbalancer

import "github.com/upbound/upjet/pkg/config"

Expand Down
32 changes: 16 additions & 16 deletions config/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import (
// Note(turkenh): we are importing this to embed provider schema document
_ "embed"

blockDevice "github.com/ankasoftco/provider-vra/config/block_device"
blockdevice "github.com/ankasoftco/provider-vra/config/block_device"
blueprint "github.com/ankasoftco/provider-vra/config/blueprint"
catalogItemEntitlement "github.com/ankasoftco/provider-vra/config/catalog_item"
catalogSource "github.com/ankasoftco/provider-vra/config/catalog_source"
cloudAccount "github.com/ankasoftco/provider-vra/config/cloud_account"
contentSource "github.com/ankasoftco/provider-vra/config/content_source"
catalogitementitlement "github.com/ankasoftco/provider-vra/config/catalog_item"
catalogsource "github.com/ankasoftco/provider-vra/config/catalog_source"
cloudaccount "github.com/ankasoftco/provider-vra/config/cloud_account"
contentsource "github.com/ankasoftco/provider-vra/config/content_source"
deployment "github.com/ankasoftco/provider-vra/config/deployment"
fabric "github.com/ankasoftco/provider-vra/config/fabric"
flavorProfile "github.com/ankasoftco/provider-vra/config/flavor_profile"
imageProfile "github.com/ankasoftco/provider-vra/config/image_profile"
flavorprofile "github.com/ankasoftco/provider-vra/config/flavor_profile"
imageprofile "github.com/ankasoftco/provider-vra/config/image_profile"
integration "github.com/ankasoftco/provider-vra/config/integration"
loadBalancer "github.com/ankasoftco/provider-vra/config/load_balancer"
loadbalancer "github.com/ankasoftco/provider-vra/config/load_balancer"
machine "github.com/ankasoftco/provider-vra/config/machine"
network "github.com/ankasoftco/provider-vra/config/network"
project "github.com/ankasoftco/provider-vra/config/project"
Expand Down Expand Up @@ -55,16 +55,16 @@ func GetProvider() *ujconfig.Provider {
blueprint.Configure,
deployment.Configure,
fabric.Configure,
blockDevice.Configure,
flavorProfile.Configure,
imageProfile.Configure,
blockdevice.Configure,
flavorprofile.Configure,
imageprofile.Configure,
storage.Configure,
catalogSource.Configure,
catalogItemEntitlement.Configure,
cloudAccount.Configure,
contentSource.Configure,
catalogsource.Configure,
catalogitementitlement.Configure,
cloudaccount.Configure,
contentsource.Configure,
integration.Configure,
loadBalancer.Configure,
loadbalancer.Configure,
machine.Configure,
network.Configure,
zone.Configure,
Expand Down
5 changes: 1 addition & 4 deletions internal/clients/vra.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ const (
const (
keyURL = "url"
keyRefreshToken = "refresh_token"

envURL = "VRA_URL"
envRefreshToken = "VRA_REFRESH_TOKEN"
)

// TerraformSetupBuilder builds Terraform a terraform.SetupFn function which
Expand Down Expand Up @@ -79,7 +76,7 @@ func TerraformSetupBuilder(version, providerSource, providerVersion string) terr
if v, ok := vraCreds[keyRefreshToken]; ok {
ps.Configuration[keyRefreshToken] = v
}

// Set credentials in Terraform provider environment.
/*ps.Env = []string{
fmt.Sprintf("%s=%s", envURL, vraCreds[keyURL]),
Expand Down

0 comments on commit 1d7f71f

Please sign in to comment.