Skip to content

Commit

Permalink
Fix go lint complaints
Browse files Browse the repository at this point in the history
  • Loading branch information
ingvagabund committed Sep 13, 2018
1 parent 821d9df commit 8e95bc2
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 21 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ push:
$(MAKE) -C cmd/cluster-controller push
$(MAKE) -C cmd/machine-controller push

check: fmt vet
check: fmt vet lint

test:
go test -race -cover ./cmd/... ./cloud/...
Expand All @@ -60,3 +60,6 @@ fmt:

vet:
hack/go-vet.sh ./...

lint:
hack/go-lint.sh $$(go list -f '{{ .ImportPath }}' ./...)
10 changes: 5 additions & 5 deletions cloud/aws/actuators/machine/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func getSubnetIDs(subnet providerconfigv1.AWSResourceReference, client awsclient
func (a *Actuator) CreateMachine(cluster *clusterv1.Cluster, machine *clusterv1.Machine) (*ec2.Instance, error) {
mLog := clustoplog.WithMachine(a.logger, machine)

machineProviderConfig, err := MachineProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
machineProviderConfig, err := ProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
if err != nil {
mLog.Errorf("error decoding MachineProviderConfig: %v", err)
return nil, err
Expand All @@ -196,7 +196,7 @@ func (a *Actuator) CreateMachine(cluster *clusterv1.Cluster, machine *clusterv1.
}

// We explicitly do NOT want to remove stopped masters.
if !MachineIsMaster(machine) {
if !IsMaster(machine) {
// Prevent having a lot of stopped nodes sitting around.
err = a.removeStoppedMachine(machine, client, mLog)
if err != nil {
Expand Down Expand Up @@ -355,7 +355,7 @@ func (a *Actuator) Delete(cluster *clusterv1.Cluster, machine *clusterv1.Machine
func (a *Actuator) DeleteMachine(cluster *clusterv1.Cluster, machine *clusterv1.Machine) error {
mLog := clustoplog.WithMachine(a.logger, machine)

machineProviderConfig, err := MachineProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
machineProviderConfig, err := ProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
if err != nil {
mLog.Errorf("error decoding MachineProviderConfig: %v", err)
return err
Expand Down Expand Up @@ -392,7 +392,7 @@ func (a *Actuator) Update(cluster *clusterv1.Cluster, machine *clusterv1.Machine
mLog := clustoplog.WithMachine(a.logger, machine)
mLog.Debugf("updating machine")

machineProviderConfig, err := MachineProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
machineProviderConfig, err := ProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
if err != nil {
mLog.Errorf("error decoding MachineProviderConfig: %v", err)
return err
Expand Down Expand Up @@ -454,7 +454,7 @@ func (a *Actuator) Exists(cluster *clusterv1.Cluster, machine *clusterv1.Machine
mLog := clustoplog.WithMachine(a.logger, machine)
mLog.Debugf("checking if machine exists")

machineProviderConfig, err := MachineProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
machineProviderConfig, err := ProviderConfigFromClusterAPIMachineSpec(&machine.Spec)
if err != nil {
mLog.Errorf("error decoding MachineProviderConfig: %v", err)
return false, err
Expand Down
12 changes: 6 additions & 6 deletions cloud/aws/actuators/machine/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ func TerminateInstances(client awsclient.Client, instances []*ec2.Instance, mLog
return nil
}

// MachineProviderFromClusterAPIMachineSpec gets the machine provider config MachineSetSpec from the
// ProviderConfigFromClusterAPIMachineSpec gets the machine provider config MachineSetSpec from the
// specified cluster-api MachineSpec.
func MachineProviderConfigFromClusterAPIMachineSpec(ms *clusterv1.MachineSpec) (*providerconfigv1.AWSMachineProviderConfig, error) {
func ProviderConfigFromClusterAPIMachineSpec(ms *clusterv1.MachineSpec) (*providerconfigv1.AWSMachineProviderConfig, error) {
if ms.ProviderConfig.Value == nil {
return nil, fmt.Errorf("no Value in ProviderConfig")
}
Expand Down Expand Up @@ -238,16 +238,16 @@ func EncodeAWSMachineProviderStatus(awsStatus *providerconfigv1.AWSMachineProvid
}, nil
}

// MachineIsMaster returns true if the machine is part of a cluster's control plane
func MachineIsMaster(machine *clusterv1.Machine) bool {
// IsMaster returns true if the machine is part of a cluster's control plane
func IsMaster(machine *clusterv1.Machine) bool {
if machineType, exists := machine.ObjectMeta.Labels[providerconfigv1.MachineTypeLabel]; exists && machineType == "master" {
return true
}
return false
}

// MachineIsInfra returns true if the machine is part of a cluster's infra plane
func MachineIsInfra(machine *clusterv1.Machine) bool {
// IsInfra returns true if the machine is part of a cluster's infra plane
func IsInfra(machine *clusterv1.Machine) bool {
if machineRole, exists := machine.ObjectMeta.Labels[providerconfigv1.MachineRoleLabel]; exists && machineRole == "infra" {
return true
}
Expand Down
5 changes: 4 additions & 1 deletion cloud/aws/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ import (
//go:generate mockgen -source=./client.go -destination=./mock/client_generated.go -package=mock

const (
AwsCredsSecretIDKey = "awsAccessKeyId"
// AwsCredsSecretIDKey is secret key containing AWS KeyId
AwsCredsSecretIDKey = "awsAccessKeyId"
// AwsCredsSecretAccessKey is secret key containing AWS Secret Key
AwsCredsSecretAccessKey = "awsSecretAccessKey"
)

// AwsClientBuilderFuncType is function type for building aws client
type AwsClientBuilderFuncType func(kubeClient kubernetes.Interface, secretName, namespace, region string) (Client, error)

// Client is a wrapper object for actual AWS SDK clients to allow for easier testing.
Expand Down
2 changes: 2 additions & 0 deletions cloud/aws/controllers/cluster/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const (
controllerName = "aws-cluster-controller"
)

// Start starts the cluster controller
func Start(server *options.Server, shutdown <-chan struct{}) {
config, err := controller.GetConfig(server.CommonConfig.Kubeconfig)
if err != nil {
Expand All @@ -71,6 +72,7 @@ func Start(server *options.Server, shutdown <-chan struct{}) {
select {}
}

// Run runs the cluster controller
func Run(server *options.Server) error {
kubeConfig, err := controller.GetConfig(server.CommonConfig.Kubeconfig)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cloud/aws/controllers/cluster/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import (
"sigs.k8s.io/cluster-api/pkg/controller/config"
)

// Server type with server configuration
type Server struct {
CommonConfig *config.Configuration
}

// NewServer builds a service configuration
func NewServer() *Server {
s := Server{
CommonConfig: &config.ControllerConfig,
Expand Down
2 changes: 2 additions & 0 deletions cloud/aws/controllers/machine/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ const (
controllerName = "aws-machine-controller"
)

// Start starts the server
func Start(server *options.Server, shutdown <-chan struct{}) {
config, err := controller.GetConfig(server.CommonConfig.Kubeconfig)
if err != nil {
Expand Down Expand Up @@ -82,6 +83,7 @@ func Start(server *options.Server, shutdown <-chan struct{}) {
select {}
}

// Run runs the server
func Run(server *options.Server) error {
kubeConfig, err := controller.GetConfig(server.CommonConfig.Kubeconfig)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions cloud/aws/controllers/machine/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import (
"sigs.k8s.io/cluster-api/pkg/controller/config"
)

// Server type with server configuration
type Server struct {
CommonConfig *config.Configuration
}

// NewServer builds a server configuration
func NewServer() *Server {
s := Server{
CommonConfig: &config.ControllerConfig,
Expand Down
8 changes: 7 additions & 1 deletion cloud/aws/providerconfig/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import (
)

var (
SchemeBuilder runtime.SchemeBuilder
// SchemeBuilder with scheme builder
SchemeBuilder runtime.SchemeBuilder
// AddToScheme is method for adding objects to the scheme
AddToScheme = SchemeBuilder.AddToScheme
localSchemeBuilder = &SchemeBuilder
)
Expand All @@ -28,14 +30,18 @@ func init() {
localSchemeBuilder.Register(addKnownTypes)
}

// GroupName is group name of the cluster kinds
const GroupName = "aws.cluster.k8s.io"

// SchemeGroupVersion is scheme group version of the cluster kinds
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}

// Kind returns group kind for a given kind/object
func Kind(kind string) schema.GroupKind {
return SchemeGroupVersion.WithKind(kind).GroupKind()
}

// Resource returns group resource for a given resource
func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource()
}
Expand Down
2 changes: 2 additions & 0 deletions cloud/aws/providerconfig/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ type TagSpecification struct {
Value string
}

// AWSClusterProviderConfig is aws speific configuration
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderConfig struct {
metav1.TypeMeta
Expand Down Expand Up @@ -166,6 +167,7 @@ type AWSMachineProviderCondition struct {
Message string
}

// AWSClusterProviderStatus is AWS specific status
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderStatus struct {
metav1.TypeMeta
Expand Down
19 changes: 16 additions & 3 deletions cloud/aws/providerconfig/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,33 @@ import (
"sigs.k8s.io/cluster-api-provider-aws/cloud/aws/providerconfig"
)

// AWSProviderConfigCodec carries AWS provider configuration encoder/decoder
// +k8s:deepcopy-gen=false
type AWSProviderConfigCodec struct {
encoder runtime.Encoder
decoder runtime.Decoder
}

// GroupName is group name of the cluster kinds
const GroupName = "aws.cluster.k8s.io"

// SchemeGroupVersion is scheme group version of the cluster kinds
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}

var (
// SchemeBuilder with scheme builder
SchemeBuilder runtime.SchemeBuilder
localSchemeBuilder = &SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme is method for adding objects to the scheme
AddToScheme = localSchemeBuilder.AddToScheme
)

var (
// Scheme with new scheme
Scheme, _ = NewScheme()
// Codecs for creating a server config
Scheme, _ = NewScheme()
Codecs = serializer.NewCodecFactory(Scheme)
Codecs = serializer.NewCodecFactory(Scheme)
// Encoder for encoding cluster objects
Encoder, _ = newEncoder(&Codecs)
)

Expand All @@ -68,6 +75,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
return nil
}

// NewScheme builds new scheme
func NewScheme() (*runtime.Scheme, error) {
scheme := runtime.NewScheme()
if err := AddToScheme(scheme); err != nil {
Expand All @@ -80,6 +88,7 @@ func NewScheme() (*runtime.Scheme, error) {
return scheme, nil
}

// NewCodec builds new coder and encoder
func NewCodec() (*AWSProviderConfigCodec, error) {
scheme, err := NewScheme()
if err != nil {
Expand All @@ -97,6 +106,7 @@ func NewCodec() (*AWSProviderConfigCodec, error) {
return &codec, nil
}

// DecodeFromProviderConfig decodes provider config into accessible object
func (codec *AWSProviderConfigCodec) DecodeFromProviderConfig(providerConfig clusterv1.ProviderConfig, out runtime.Object) error {
if providerConfig.Value != nil {
_, _, err := codec.decoder.Decode(providerConfig.Value.Raw, nil, out)
Expand All @@ -107,6 +117,7 @@ func (codec *AWSProviderConfigCodec) DecodeFromProviderConfig(providerConfig clu
return nil
}

// EncodeToProviderConfig encodes provider config into raw bytes
func (codec *AWSProviderConfigCodec) EncodeToProviderConfig(in runtime.Object) (*clusterv1.ProviderConfig, error) {
var buf bytes.Buffer
if err := codec.encoder.Encode(in, &buf); err != nil {
Expand All @@ -117,6 +128,7 @@ func (codec *AWSProviderConfigCodec) EncodeToProviderConfig(in runtime.Object) (
}, nil
}

// EncodeProviderStatus decodes provider status into accessible object
func (codec *AWSProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*runtime.RawExtension, error) {
var buf bytes.Buffer
if err := codec.encoder.Encode(in, &buf); err != nil {
Expand All @@ -126,6 +138,7 @@ func (codec *AWSProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*r
return &runtime.RawExtension{Raw: buf.Bytes()}, nil
}

// DecodeProviderStatus encodes status into raw bytes
func (codec *AWSProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
if providerStatus != nil {
_, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out)
Expand Down
1 change: 1 addition & 0 deletions cloud/aws/providerconfig/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ type TagSpecification struct {
Value string `json:"value"`
}

// AWSClusterProviderStatus is AWS specific status
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
type AWSClusterProviderStatus struct {
metav1.TypeMeta `json:",inline"`
Expand Down
8 changes: 4 additions & 4 deletions cmd/aws-actuator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,12 @@ bash /root/user-data.sh > /root/user-data.logs
`

type userDataParams struct {
MasterIP string
masterIP string
}

func generateWorkerUserData(masterIp string, workerUserDataSecret *apiv1.Secret) (*apiv1.Secret, error) {
func generateWorkerUserData(masterIP string, workerUserDataSecret *apiv1.Secret) (*apiv1.Secret, error) {
params := userDataParams{
MasterIP: masterIp,
masterIP: masterIP,
}
t, err := template.New("workeruserdata").Parse(workerUserDataBlob)
if err != nil {
Expand Down Expand Up @@ -312,7 +312,7 @@ func bootstrapCommand() *cobra.Command {
log.Infof("Generating worker user data for master listening at %v", *result.PrivateIpAddress)
workerUserDataSecret, err = generateWorkerUserData(*result.PrivateIpAddress, workerUserDataSecret)
if err != nil {
return fmt.Errorf("Unable to generate worker user data: %v\n", err)
return fmt.Errorf("unable to generate worker user data: %v", err)
}

log.Infof("Creating worker machine")
Expand Down
1 change: 1 addition & 0 deletions test/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
awsclient "sigs.k8s.io/cluster-api-provider-aws/cloud/aws/client"
)

// GenerateAwsCredentialsSecretFromEnv generates secret with AWS credentials
func GenerateAwsCredentialsSecretFromEnv(secretName, namespace string) *apiv1.Secret {
return &apiv1.Secret{
ObjectMeta: metav1.ObjectMeta{
Expand Down

0 comments on commit 8e95bc2

Please sign in to comment.