Fix linters

Author: KevinFairise2

components/datadog/agent/host_macos.go

@@ -21,7 +21,7 @@ func newMacOSManager(host *remoteComp.Host) agentOSManager {
 }
 
 // directInstallCommand expects a locally provided .dmg or .pkg uploaded to the host; it will install it with installer
-func (am *agentMacOSManager) directInstallCommand(env config.Env, packagePath string, _ agentparams.PackageVersion, additionalInstallParameters []string, opts ...pulumi.ResourceOption) (command.Command, error) {
+func (am *agentMacOSManager) directInstallCommand(_ config.Env, _ string, _ agentparams.PackageVersion, _ []string, _ ...pulumi.ResourceOption) (command.Command, error) {
 	// Unsupported for now.
 	return nil, fmt.Errorf("installing directly from a dmg without the install script requires way too many step that would imply duplicating the install script code in there")
 }
@@ -70,7 +70,7 @@ func (am *agentMacOSManager) restartAgentServices(transform command.Transformer,
 	return am.host.OS.Runner().Command(cmdName, cmdArgs, opts...)
 }
 
-func (am *agentMacOSManager) ensureAgentUninstalled(version agentparams.PackageVersion, opts ...pulumi.ResourceOption) (command.Command, error) {
+func (am *agentMacOSManager) ensureAgentUninstalled(_ agentparams.PackageVersion, opts ...pulumi.ResourceOption) (command.Command, error) {
 	// No-op the install script should support installing again when the agent is already installed
 	return am.host.OS.Runner().Command("no-op-uninstall-agent", &command.Args{
 		Create: pulumi.String("true"),

components/datadog/agent/package.go

@@ -44,8 +44,8 @@ func GetPackagePath(localPath string, flavor tifos.Flavor, agentFlavor string, a
 		wantedExt = ".deb"
 	case tifos.WindowsServer:
 		wantedExt = ".msi"
-	case tifos.MacosOS:
-		wantedExt = ".dmg"
+	case tifos.MacosOS, tifos.Unknown:
+		fallthrough
 	default:
 		return "", fmt.Errorf("unsupported flavor for local packages installation: %s", flavor)
 	}

components/os/macos_servicemanagers.go

@@ -21,7 +21,7 @@ func (s *macOSServiceManager) EnsureRestarted(serviceName string, transform comm
 	cmdName := s.e.CommonNamer().ResourceName("running", serviceName)
 	var cmdArgs command.RunnerCommandArgs = &command.Args{
 		Sudo:   true,
-		Create: pulumi.String(fmt.Sprintf("launchctl kickstart -k %s'", serviceName, serviceName)),
+		Create: pulumi.String(fmt.Sprintf("launchctl kickstart -k %s'", serviceName)),
 	}
 
 	// If a transform is provided, use it to modify the command name and args

resources/aws/ec2/vm.go

@@ -23,7 +23,7 @@ type InstanceArgs struct {
 	// Optional
 	UserData           string
 	HTTPTokensRequired bool
-	HostId             pulumi.StringInput // For dedicated host tenancy
+	HostID             pulumi.StringInput // For dedicated host tenancy
 }
 
 func NewInstance(e aws.Environment, name string, args InstanceArgs, opts ...pulumi.ResourceOption) (*ec2.Instance, error) {
@@ -46,7 +46,7 @@ func NewInstance(e aws.Environment, name string, args InstanceArgs, opts ...pulu
 			"Name": e.Namer.DisplayName(255, pulumi.String(name)),
 		},
 		InstanceInitiatedShutdownBehavior: pulumi.String(e.DefaultShutdownBehavior()),
-		HostId:                            args.HostId,
+		HostId:                            args.HostID,
 	}
 
 	if args.HTTPTokensRequired {

scenarios/aws/ec2/vm.go

@@ -50,17 +50,17 @@ func NewVM(e aws.Environment, name string, params ...VMOption) (*remote.Host, er
 			InstanceProfile:    vmArgs.instanceProfile,
 			HTTPTokensRequired: vmArgs.httpTokensRequired,
 			Tenancy:            vmArgs.tenancy,
-			HostId:             pulumi.String(vmArgs.hostId),
+			HostID:             pulumi.String(vmArgs.hostID),
 		}
 
-		if vmArgs.osInfo.Family() == os.MacOSFamily && vmArgs.hostId == "" {
+		if vmArgs.osInfo.Family() == os.MacOSFamily && vmArgs.hostID == "" {
 			dedicatedHost, err := ec2.NewDedicatedHost(e, name, ec2.DedicatedHostArgs{
 				InstanceType: vmArgs.instanceType,
 			})
 			if err != nil {
 				return err
 			}
-			instanceArgs.HostId = dedicatedHost.Arn.ApplyT(func(arn string) pulumi.StringInput {
+			instanceArgs.HostID = dedicatedHost.Arn.ApplyT(func(arn string) pulumi.StringInput {
 				splitted := strings.Split(arn, "/")
 				return pulumi.String(splitted[len(splitted)-1])
 			}).(pulumi.StringInput)

scenarios/aws/ec2/vmargs.go

@@ -17,6 +17,7 @@ import (
 //   - [WithUserData]
 //   - [WithName]
 //   - [WithHostID]
+//   - [WithTenancy]
 //
 // [Functional options pattern]: https://dave.cheney.net/2014/10/17/functional-options-for-friendly-apis
 
@@ -27,7 +28,7 @@ type vmArgs struct {
 	instanceType    string
 	instanceProfile string
 	tenancy         string
-	hostId          string
+	hostID          string
 
 	httpTokensRequired bool
 }
@@ -94,9 +95,17 @@ func WithIMDSv1Disable() VMOption {
 }
 
 // WithHostId sets the dedicated host ID for the instance
-func WithHostId(hostId string) VMOption {
+func WithHostID(hostID string) VMOption {
 	return func(p *vmArgs) error {
-		p.hostId = hostId
+		p.hostID = hostID
+		return nil
+	}
+}
+
+// WithTenancy sets the tenancy for the instance
+func WithTenancy(tenancy string) VMOption {
+	return func(p *vmArgs) error {
+		p.tenancy = tenancy
 		return nil
 	}
 }