Skip to content

Commit

Permalink
removed all linting errors
Browse files Browse the repository at this point in the history 
Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
  • Loading branch information
@hasheddan
hasheddan committed Aug 9, 2019
1 parent ee03159 commit a56c047
Show file tree
Hide file tree
Showing 61 changed files with 94 additions and 48 deletions.
3 changes: 2 additions & 1 deletion apis/apis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ limitations under the License.
package apis

import (
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/cache"
"github.com/crossplaneio/crossplane/apis/compute"
"github.com/crossplaneio/crossplane/apis/core"
"github.com/crossplaneio/crossplane/apis/database"
"github.com/crossplaneio/crossplane/apis/extensions"
"github.com/crossplaneio/crossplane/apis/storage"
"github.com/crossplaneio/crossplane/apis/workload"
"k8s.io/apimachinery/pkg/runtime"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion apis/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package cache

import (
"github.com/crossplaneio/crossplane/apis/cache/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/cache/v1alpha1"
)

func init() {
Expand Down
5 changes: 2 additions & 3 deletions apis/cache/v1alpha1/rediscluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ limitations under the License.
package v1alpha1

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/apis/core/v1alpha1"
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
"github.com/crossplaneio/crossplane/pkg/resource"
)

Expand Down Expand Up @@ -115,7 +114,7 @@ type RedisClusterPolicy struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

corev1alpha1.Policy `json:",inline"`
v1alpha1.Policy `json:",inline"`
}

// All policy lists must satisfy the PolicyList interface
Expand Down
1 change: 1 addition & 0 deletions apis/cache/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=cache.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/compute/compute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package compute

import (
"github.com/crossplaneio/crossplane/apis/compute/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/compute/v1alpha1"
)

func init() {
Expand Down
1 change: 1 addition & 0 deletions apis/compute/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=compute.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/compute/v1alpha1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package v1alpha1

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
)

// KubernetesClusterSpec specifies the configuration of a Kubernetes cluster.
Expand Down
3 changes: 2 additions & 1 deletion apis/core/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package core

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
)

func init() {
Expand Down
1 change: 1 addition & 0 deletions apis/core/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=core.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
2 changes: 1 addition & 1 deletion apis/core/v1alpha1/zz_generated.deepcopy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
package v1alpha1

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)

Expand Down
3 changes: 2 additions & 1 deletion apis/database/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package database

import (
"github.com/crossplaneio/crossplane/apis/database/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/database/v1alpha1"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion apis/database/database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package storage contains Kubernetes API groups for cloud provider storage.
// Package database contains Kubernetes API groups for database resource claims.
package database

import (
Expand Down
1 change: 1 addition & 0 deletions apis/database/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=database.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/database/v1alpha1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package v1alpha1

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
)

// MySQLInstanceSpec specifies the configuration of a MySQL instance.
Expand Down
3 changes: 2 additions & 1 deletion apis/extensions/extensions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package extensions

import (
"github.com/crossplaneio/crossplane/apis/extensions/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/extensions/v1alpha1"
)

func init() {
Expand Down
1 change: 1 addition & 0 deletions apis/extensions/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=extensions.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/extensions/v1alpha1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ limitations under the License.
package v1alpha1

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
apps "k8s.io/api/apps/v1"
batch "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
)

// TODO: how do we pretty print conditioned status items? There may be multiple of them, and they
Expand Down
2 changes: 1 addition & 1 deletion apis/extensions/v1alpha1/zz_generated.deepcopy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
package v1alpha1

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
Expand Down
3 changes: 2 additions & 1 deletion apis/storage/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package storage

import (
"github.com/crossplaneio/crossplane/apis/storage/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/storage/v1alpha1"
)

func init() {
Expand Down
1 change: 1 addition & 0 deletions apis/storage/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=storage.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/storage/v1alpha1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package v1alpha1

import (
"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"
)

// LocalPermissionType - Base type for LocalPermissions
Expand Down
1 change: 1 addition & 0 deletions apis/workload/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=workload.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion apis/workload/v1alpha1/zz_generated.deepcopy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ package v1alpha1

import (
"encoding/json"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)

Expand Down
3 changes: 2 additions & 1 deletion apis/workload/workload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package workload

import (
"github.com/crossplaneio/crossplane/apis/workload/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplaneio/crossplane/apis/workload/v1alpha1"
)

func init() {
Expand Down
5 changes: 3 additions & 2 deletions aws/apis/aws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ limitations under the License.
// Generate deepcopy for apis
//go:generate go run ../../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=./aws/apis/...

// Package aws contains Kubernetes API groups for AWS cloud provider.
// Package apis contains Kubernetes API groups for AWS cloud provider.
package apis

import (
"k8s.io/apimachinery/pkg/runtime"

cachev1alpha1 "github.com/crossplaneio/crossplane/aws/apis/cache/v1alpha1"
computev1alpha1 "github.com/crossplaneio/crossplane/aws/apis/compute/v1alpha1"
databasev1alpha1 "github.com/crossplaneio/crossplane/aws/apis/database/v1alpha1"
storagev1alpha1 "github.com/crossplaneio/crossplane/aws/apis/storage/v1alpha1"
awsv1alpha1 "github.com/crossplaneio/crossplane/aws/apis/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion aws/apis/aws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package aws contains Kubernetes API groups for AWS cloud provider.
// Package apis contains Kubernetes API groups for AWS cloud provider.
package apis

import (
Expand Down
1 change: 1 addition & 0 deletions aws/apis/cache/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=cache.aws.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
1 change: 1 addition & 0 deletions aws/apis/compute/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// +groupName=compute.aws.crossplane.io

// Package compute contains AWS container API versions
package compute
1 change: 1 addition & 0 deletions aws/apis/compute/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=compute.aws.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
1 change: 1 addition & 0 deletions aws/apis/database/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// +groupName=database.aws.crossplane.io

// Package database contains AWS database API versions
package database
1 change: 1 addition & 0 deletions aws/apis/database/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=database.aws.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
1 change: 1 addition & 0 deletions aws/apis/storage/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// +groupName=storage.aws.crossplane.io

// Package storage contains AWS storage API versions
package storage
11 changes: 6 additions & 5 deletions aws/apis/storage/v1alpha1/bucket_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package v1alpha1

import (
storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"
"strconv"

storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"

"github.com/crossplaneio/crossplane/apis/core/v1alpha1"

"github.com/aws/aws-sdk-go-v2/service/s3"
Expand Down Expand Up @@ -57,10 +58,10 @@ type S3BucketSpec struct {
type S3BucketStatus struct {
v1alpha1.ResourceStatus `json:",inline"`

Message string `json:"message,omitempty"`
ProviderID string `json:"providerID,omitempty"` // the external ID to identify this resource in the cloud provider
IAMUsername string `json:"iamUsername,omitempty"`
LastUserPolicyVersion int `json:"lastUserPolicyVersion,omitempty"`
Message string `json:"message,omitempty"`
ProviderID string `json:"providerID,omitempty"` // the external ID to identify this resource in the cloud provider
IAMUsername string `json:"iamUsername,omitempty"`
LastUserPolicyVersion int `json:"lastUserPolicyVersion,omitempty"`
LastLocalPermission storagev1alpha1.LocalPermissionType `json:"lastLocalPermission,omitempty"`
}

Expand Down
1 change: 1 addition & 0 deletions aws/apis/storage/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=storage.aws.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
3 changes: 2 additions & 1 deletion aws/apis/storage/v1alpha1/zz_generated.deepcopy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ package v1alpha1

import (
"github.com/aws/aws-sdk-go-v2/service/s3"
storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"
runtime "k8s.io/apimachinery/pkg/runtime"

storagev1alpha1 "github.com/crossplaneio/crossplane/apis/storage/v1alpha1"
)

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
Expand Down
1 change: 1 addition & 0 deletions aws/apis/v1alpha1/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +groupName=aws.crossplane.io
// +versionName=v1alpha1

package v1alpha1

import (
Expand Down
2 changes: 1 addition & 1 deletion azure/apis/azure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
// Generate deepcopy for apis
//go:generate go run ../../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=./azure/apis/...

// Package azure contains Kubernetes API groups for Azure cloud provider.
// Package apis contains Kubernetes API groups for Azure cloud provider.
package apis

import (
Expand Down
Loading

0 comments on commit a56c047

Please sign in to comment.