Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 01c8cd8

Browse files
committed
fix: unexport local variables
Signed-off-by: Chris Privitere <[email protected]>
1 parent fe7ba81 commit 01c8cd8

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

cmd/ci-clean/main.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ import (
3333
)
3434

3535
const (
36-
AuthTokenEnvVar = "PACKET_API_KEY" //nolint:gosec
37-
ProjectIDEnvVar = "PROJECT_ID"
36+
authTokenEnvVar = "PACKET_API_KEY" //nolint:gosec
37+
projectIDEnvVar = "PROJECT_ID"
3838
)
3939

40-
var ErrMissingRequiredEnvVar = errors.New("required environment variable not set")
40+
var errMissingRequiredEnvVar = errors.New("required environment variable not set")
4141

4242
func main() {
4343
rand.Seed(time.Now().UTC().UnixNano())
@@ -46,14 +46,14 @@ func main() {
4646
Use: "ci-clean",
4747
Short: "Clean up any stray resources in CI",
4848
RunE: func(cmd *cobra.Command, args []string) error {
49-
metalAuthToken := os.Getenv(AuthTokenEnvVar)
49+
metalAuthToken := os.Getenv(authTokenEnvVar)
5050
if metalAuthToken == "" {
51-
return fmt.Errorf("%s: %w", AuthTokenEnvVar, ErrMissingRequiredEnvVar)
51+
return fmt.Errorf("%s: %w", authTokenEnvVar, errMissingRequiredEnvVar)
5252
}
5353

54-
metalProjectID := os.Getenv(ProjectIDEnvVar)
54+
metalProjectID := os.Getenv(projectIDEnvVar)
5555
if metalProjectID == "" {
56-
return fmt.Errorf("%s: %w", ProjectIDEnvVar, ErrMissingRequiredEnvVar)
56+
return fmt.Errorf("%s: %w", projectIDEnvVar, errMissingRequiredEnvVar)
5757
}
5858

5959
return cleanup(context.Background(), metalAuthToken, metalProjectID) //nolint:wrapcheck

controllers/packetmachine_controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ const (
5353
)
5454

5555
var (
56-
ErrMissingDevice = errors.New("machine does not exist")
57-
ErrFacilityMatch = errors.New("instance facility does not match machine facility")
58-
ErrMetroMatch = errors.New("instance metro does not match machine metro")
56+
errMissingDevice = errors.New("machine does not exist")
57+
errFacilityMatch = errors.New("instance facility does not match machine facility")
58+
errMetroMatch = errors.New("instance metro does not match machine metro")
5959
)
6060

6161
// PacketMachineReconciler reconciles a PacketMachine object
@@ -425,11 +425,11 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
425425
deviceMetro := dev.Metro.Code
426426

427427
if machineScope.PacketMachine.Spec.Facility != "" && machineScope.PacketMachine.Spec.Facility != *deviceFacility {
428-
return ctrl.Result{}, fmt.Errorf("%w: %s != %s", ErrFacilityMatch, machineScope.PacketMachine.Spec.Facility, *deviceFacility)
428+
return ctrl.Result{}, fmt.Errorf("%w: %s != %s", errFacilityMatch, machineScope.PacketMachine.Spec.Facility, *deviceFacility)
429429
}
430430

431431
if machineScope.PacketMachine.Spec.Metro != "" && machineScope.PacketMachine.Spec.Metro != *deviceMetro {
432-
return ctrl.Result{}, fmt.Errorf("%w: %s != %s", ErrMetroMatch, machineScope.PacketMachine.Spec.Facility, *deviceMetro)
432+
return ctrl.Result{}, fmt.Errorf("%w: %s != %s", errMetroMatch, machineScope.PacketMachine.Spec.Facility, *deviceMetro)
433433
}
434434

435435
return result, nil
@@ -494,7 +494,7 @@ func (r *PacketMachineReconciler) reconcileDelete(ctx context.Context, machineSc
494494
// We should never get there but this is a safetly check
495495
if device == nil {
496496
controllerutil.RemoveFinalizer(packetmachine, infrav1.MachineFinalizer)
497-
return ctrl.Result{}, fmt.Errorf("%w: %s", ErrMissingDevice, packetmachine.Name)
497+
return fmt.Errorf("%w: %s", errMissingDevice, packetmachine.Name)
498498
}
499499

500500
apiRequest := r.PacketClient.DevicesApi.DeleteDevice(ctx, device.GetId()).ForceDelete(force)

pkg/cloud/packet/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
const (
24-
MachineUIDTag = "cluster-api-provider-packet:machine-uid"
24+
machineUIDTag = "cluster-api-provider-packet:machine-uid"
2525
clusterIDTag = "cluster-api-provider-packet:cluster-id"
2626
namespaceTag = "cluster-api-provider-packet:namespace"
2727
)

0 commit comments

Comments
 (0)