Skip to content

Commit 51c3125

Browse files
Apply suggestions from code review
Co-authored-by: Célian Raimbault <161456554+CelianR@users.noreply.github.com>
1 parent 14e1043 commit 51c3125

5 files changed

Lines changed: 5 additions & 9 deletions

File tree

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ Run any `-h` on any of the available tasks for more information
6363
## MacOS support
6464

6565
The `aws.create-vm` task should allow you to spin up a MacOS instance using `-o macos` flag. Note that spinning such an instance is expensive because it requires a dedicated host. When you have one running please reuse it instead of creating new instances every time you need it. The cleaner will automatically get rid of the dedicated hosts.
66-
67-
68-
6966
## Troubleshooting
7067

7168
### Environment and configuration

components/datadog/agent/host_macos.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func newMacOSManager(host *remoteComp.Host) agentOSManager {
2222

2323
// directInstallCommand expects a locally provided .dmg or .pkg uploaded to the host; it will install it with installer
2424
func (am *agentMacOSManager) directInstallCommand(env config.Env, packagePath string, _ agentparams.PackageVersion, additionalInstallParameters []string, opts ...pulumi.ResourceOption) (command.Command, error) {
25-
// Unsupported for now, installing directly from a dmg without the install script requires way too many step that would imply duplicating the install script code in there.
25+
// Unsupported for now.
2626
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")
2727
}
2828

resources/aws/ec2/dedicated_host.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ func NewDedicatedHost(e aws.Environment, name string, args DedicatedHostArgs, op
5858
return ec2.NewDedicatedHost(e.Ctx(),
5959
e.Namer.ResourceName(name),
6060
dedicatedHostArgs,
61-
utils.MergeOptions(opts, e.WithProviders(config.ProviderAWS), pulumi.RetainOnDelete(true))..., // Retain on delete because deleting a dedicated host is not possible unless it lived for at least 24 hours, the cleanup will be done by test-infra-cleaner
61+
utils.MergeOptions(opts, e.WithProviders(config.ProviderAWS), pulumi.RetainOnDelete(true))..., // Retain on delete because deleting a dedicated host is not possible unless it lived for at least 24 hours, the cleanup will be done by test-infra-cleaner
6262
)
6363
}

resources/aws/environmentDefaults.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,9 @@ func tsePlaygroundDefault() environmentDefault {
292292
ddInfra: ddInfra{
293293
defaultVPCID: "vpc-0570ac09560a97693",
294294
defaultSubnets: []SubnetConfig{
295-
{ID: "subnet-0ec4b9823cf352b95", MacOSCompatible: true},
296-
{ID: "subnet-0e9c45e996754e357", MacOSCompatible: false},
297-
{ID: "subnet-070e1a6c79f6bc499", MacOSCompatible: true},
295+
{ID: "subnet-0ec4b9823cf352b95", MacOSCompatible: true}, // us-east-1a
296+
{ID: "subnet-0e9c45e996754e357", MacOSCompatible: false}, // us-east-1d
297+
{ID: "subnet-070e1a6c79f6bc499", MacOSCompatible: true}, // us-east-1b
298298
},
299299
defaultSecurityGroups: []string{"sg-091a00b0944f04fd2", "sg-073f15b823d4bb39a", "sg-0a3ec6b0ee295e826"},
300300
defaultInstanceType: "t3.medium",

scenarios/aws/ec2/vm_run.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ func VMRun(ctx *pulumi.Context) error {
2424
}
2525

2626
osDesc := os.DescriptorFromString(env.InfraOSDescriptor(), os.AmazonLinuxECSDefault)
27-
2827
vm, err := NewVM(env, "vm", WithAMI(env.InfraOSImageID(), osDesc, osDesc.Architecture))
2928
if err != nil {
3029
return err

0 commit comments

Comments
 (0)