Small fixups.

Joshua Reed · Joshua Reed · commit 37d6643d2966 · 2022-05-24T23:24:24.000-07:00
diff --git a/pkg/cloud/isolated_network.go b/pkg/cloud/isolated_network.go
@@ -247,8 +247,9 @@ func (c *client) GetOrCreateIsolatedNetwork(
 		if err = c.CreateIsolatedNetwork(zone, isoNet); err != nil {
 			return errors.Wrap(err, "creating a new isolated network")
 		}
+	} else {
+		isoNet.Spec.ID = net.ID
 	}
-	isoNet.Spec.ID = net.ID
 
 	// Tag the created network.
 	networkID := isoNet.Spec.ID
diff --git a/test/helpers/user.go b/test/helpers/user.go
@@ -166,7 +166,7 @@ func GetOrCreateUserWithKey(csClient *cloudstack.CloudStackClient, user *cloud.U
 	} else { // User not found, create user.
 		// TODO: If ever needed, actually implement user creation here.
 		// For now we only care about the default account since this is a testing infrastructure method.
-		return fmt.Errorf("User not found for %s", user.Name)
+		return fmt.Errorf("user not found for %s", user.Name)
 	}
 
 	pGKey := csClient.User.NewGetUserKeysParams(user.ID)

Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,9 @@ func (c *client) GetOrCreateIsolatedNetwork(`
`247`	`247`	`if err = c.CreateIsolatedNetwork(zone, isoNet); err != nil {`
`248`	`248`	`return errors.Wrap(err, "creating a new isolated network")`
`249`	`249`	`}`
	`250`	`+ } else {`
	`251`	`+ isoNet.Spec.ID = net.ID`
`250`	`252`	`}`
`251`		`- isoNet.Spec.ID = net.ID`
`252`	`253`
`253`	`254`	`// Tag the created network.`
`254`	`255`	`networkID := isoNet.Spec.ID`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func GetOrCreateUserWithKey(csClient cloudstack.CloudStackClient, user cloud.U`
`166`	`166`	`} else { // User not found, create user.`
`167`	`167`	`// TODO: If ever needed, actually implement user creation here.`
`168`	`168`	`// For now we only care about the default account since this is a testing infrastructure method.`
`169`		`- return fmt.Errorf("User not found for %s", user.Name)`
	`169`	`+ return fmt.Errorf("user not found for %s", user.Name)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`pGKey := csClient.User.NewGetUserKeysParams(user.ID)`