chore: lint nit-picks

Author: isometry

api/v1/clustertoken_types.go

@@ -106,9 +106,9 @@ type ClusterTokenStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+kubebuilder:resource:scope=Cluster
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
 
 // ClusterToken is the Schema for the clustertokens API
 type ClusterToken struct {
@@ -205,12 +205,12 @@ func (t *ClusterToken) SetStatusCondition(condition metav1.Condition) (changed b
 	return meta.SetStatusCondition(&t.Status.Conditions, condition)
 }
 
-//+kubebuilder:object:root=true
+// +kubebuilder:object:root=true
 
 // ClusterTokenList contains a list of ClusterToken
 type ClusterTokenList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata"`
 	Items           []ClusterToken `json:"items"`
 }
 

api/v1/token_types.go

@@ -198,12 +198,12 @@ func (t *Token) SetStatusCondition(condition metav1.Condition) (changed bool) {
 	return meta.SetStatusCondition(&t.Status.Conditions, condition)
 }
 
-//+kubebuilder:object:root=true
+// +kubebuilder:object:root=true
 
 // TokenList contains a list of Token
 type TokenList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta `json:"metadata"`
 	Items           []Token `json:"items"`
 }
 

cmd/manager/main.go

@@ -40,7 +40,7 @@ import (
 
 	githubv1 "github.com/isometry/github-token-manager/api/v1"
 	"github.com/isometry/github-token-manager/internal/controller"
-	//+kubebuilder:scaffold:imports
+	// +kubebuilder:scaffold:imports
 )
 
 var (
@@ -52,7 +52,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(githubv1.AddToScheme(scheme))
-	//+kubebuilder:scaffold:scheme
+	// +kubebuilder:scaffold:scheme
 }
 
 func main() {
@@ -156,7 +156,7 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "ClusterToken")
 		os.Exit(1)
 	}
-	//+kubebuilder:scaffold:builder
+	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")

internal/controller/clustertoken_controller.go

@@ -39,11 +39,11 @@ type ClusterTokenReconciler struct {
 	// Recorder record.EventRecorder
 }
 
-//+kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens/finalizers,verbs=update
-//+kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
-//+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=github.as-code.io,resources=clustertokens/finalizers,verbs=update
+// +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
+// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.

internal/controller/suite_test.go

@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	githubv1 "github.com/isometry/github-token-manager/api/v1"
-	//+kubebuilder:scaffold:imports
+	// +kubebuilder:scaffold:imports
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
 	err = githubv1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
-	//+kubebuilder:scaffold:scheme
+	// +kubebuilder:scaffold:scheme
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())

internal/controller/token_controller.go

@@ -39,11 +39,11 @@ type TokenReconciler struct {
 	// Recorder record.EventRecorder
 }
 
-//+kubebuilder:rbac:groups=github.as-code.io,resources=tokens,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=github.as-code.io,resources=tokens/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=github.as-code.io,resources=tokens/finalizers,verbs=update
-//+kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
-//+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=github.as-code.io,resources=tokens,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=github.as-code.io,resources=tokens/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=github.as-code.io,resources=tokens/finalizers,verbs=update
+// +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
+// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.

internal/ghapp/config.go

@@ -46,10 +46,10 @@ func LoadConfig(ctx context.Context) (*OperatorConfig, error) {
 	viper.AutomaticEnv()
 	viper.SetEnvPrefix("GTM")
 
-	viper.BindEnv("app_id", "GTM_APP_ID", "GITHUB_APP_ID")
-	viper.BindEnv("installation_id", "GTM_INSTALLATION_ID", "GITHUB_INSTALLATION_ID")
-	viper.BindEnv("provider", "GTM_PROVIDER", "KMS_PROVIDER")
-	viper.BindEnv("key", "GTM_KEY", "KMS_KEY", "GITHUB_PRIVATE_KEY")
+	_ = viper.BindEnv("app_id", "GTM_APP_ID", "GITHUB_APP_ID")
+	_ = viper.BindEnv("installation_id", "GTM_INSTALLATION_ID", "GITHUB_INSTALLATION_ID")
+	_ = viper.BindEnv("provider", "GTM_PROVIDER", "KMS_PROVIDER")
+	_ = viper.BindEnv("key", "GTM_KEY", "KMS_KEY", "GITHUB_PRIVATE_KEY")
 
 	viper.SetDefault("provider", "file")
 

internal/tokenmanager/token_secret.go

@@ -260,7 +260,7 @@ func (s *tokenSecret) UpdateSecret() error {
 		return err
 	}
 
-	s.Secret.Data = s.SecretData(installationToken.GetToken())
+	s.Data = s.SecretData(installationToken.GetToken())
 
 	condition := metav1.Condition{
 		Type:    githubv1.ConditionTypeAvailable,