Merge pull request #162 from ovh/flags

fix: safe wrappers for MarkFlagsMutuallyExclusive to prevent WASM panics

Author: amstuta

.goreleaser.yaml

@@ -18,6 +18,8 @@ builds:
     binary: ovhcloud
     env:
       - CGO_ENABLED=0
+    flags:
+    - -trimpath
     ldflags:
       - -s -w -extldflags -static -X github.com/ovh/ovhcloud-cli/internal/version.Version={{.Tag}}
     goos:
@@ -30,6 +32,8 @@ builds:
     binary: ovhcloud
     env:
       - CGO_ENABLED=0
+    flags:
+    - -trimpath
     ldflags:
       - -s -w -extldflags -static -X github.com/ovh/ovhcloud-cli/internal/version.Version={{.Tag}}
     goos:
@@ -79,4 +83,4 @@ homebrew_casks:
     directory: Casks
     caveats: "See https://github.com/ovh/ovhcloud-cli for usage."
     homepage: "https://github.com/ovh/ovhcloud-cli"
-    description: "OVHcloud CLI - Command line interface for OVHcloud."
+    description: "OVHcloud CLI - Command line interface for OVHcloud."

Makefile

@@ -9,10 +9,10 @@ BUILD_CMD = CGO_ENABLED=0 go build
 all: build
 
 build:
-	${BUILD_CMD} -ldflags "${LD_FLAGS}" -o ovhcloud ./cmd/ovhcloud
+	${BUILD_CMD} -trimpath -ldflags "${LD_FLAGS}" -o ovhcloud ./cmd/ovhcloud
 
 wasm:
-	GOOS=js GOARCH=wasm ${BUILD_CMD} -ldflags "${LD_FLAGS}" -o ovhcloud.wasm ./cmd/ovhcloud
+	GOOS=js GOARCH=wasm ${BUILD_CMD} -trimpath -ldflags "${LD_FLAGS}" -o ovhcloud.wasm ./cmd/ovhcloud
 
 test:
 	go test -v ./...

internal/cmd/account.go

@@ -80,7 +80,7 @@ func init() {
 	oauth2CreateCmd.Flags().StringVar(&account.Oauth2ClientSpec.Name, "name", "", "Name of the OAuth2 client")
 	addParameterFileFlags(oauth2CreateCmd, false, assets.MeOpenapiSchema, "/me/api/oauth2/client", "post", account.Oauth2ClientCreateSample, nil)
 	addInteractiveEditorFlag(oauth2CreateCmd)
-	oauth2CreateCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(oauth2CreateCmd, "from-file", "editor")
 
 	oauth2ClientCmd.AddCommand(oauth2CreateCmd)
 

internal/cmd/baremetal.go

@@ -148,7 +148,7 @@ Please note that all parameters are not compatible with all OSes.
 	reinstallBaremetalCmd.Flags().StringVar(&baremetal.Customizations.PostInstallationScriptExtension, "post-installation-script-extension", "", "Post-installation script extension (cmd, ps1)")
 	reinstallBaremetalCmd.Flags().StringVar(&baremetal.Customizations.SshKey, "ssh-key", "", "SSH public key")
 	reinstallBaremetalCmd.Flags().BoolVar(&flags.WaitForTask, "wait", false, "Wait for reinstall to be done before exiting")
-	reinstallBaremetalCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(reinstallBaremetalCmd, "from-file", "editor")
 	baremetalCmd.AddCommand(reinstallBaremetalCmd)
 
 	// List boots and their options
@@ -180,8 +180,8 @@ Please note that all parameters are not compatible with all OSes.
 	baremetalBootSetScriptCmd.Flags().StringVar(&baremetal.EditBaremetalParams.BootScript, "script", "", "Boot script to set on the baremetal")
 	addInteractiveEditorFlag(baremetalBootSetScriptCmd)
 	addParameterFileFlags(baremetalBootSetScriptCmd, true, nil, "", "", "", nil)
-	baremetalBootSetScriptCmd.MarkFlagsOneRequired("script", "from-file", "editor")
-	baremetalBootSetScriptCmd.MarkFlagsMutuallyExclusive("script", "from-file", "editor")
+	markFlagsOneRequired(baremetalBootSetScriptCmd, "script", "from-file", "editor")
+	markFlagsMutuallyExclusive(baremetalBootSetScriptCmd, "script", "from-file", "editor")
 	baremetalBootCmd.AddCommand(baremetalBootSetScriptCmd)
 
 	baremetalListInterventionsCmd := &cobra.Command{

internal/cmd/cloud_alerting.go

@@ -47,7 +47,7 @@ func initCloudAlertingCommand(cloudCmd *cobra.Command) {
 	alertingCreateCmd.Flags().StringVar(&cloud.AlertingConfigSpec.Service, "service", "", "Service of the alert. Allowed: ai_endpoint, all, block_storage, data_platform, instances, instances_gpu, instances_without_gpu, objet_storage, rancher, snapshot")
 	addParameterFileFlags(alertingCreateCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/alerting", "post", cloud.AlertingConfigCreateExample, nil)
 	addInteractiveEditorFlag(alertingCreateCmd)
-	alertingCreateCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(alertingCreateCmd, "from-file", "editor")
 	alertingCmd.AddCommand(alertingCreateCmd)
 
 	// Edit alerting configuration

internal/cmd/cloud_container_registry.go

@@ -52,7 +52,7 @@ func initContainerRegistryCommand(cloudCmd *cobra.Command) {
 	createCmd.Flags().StringVar(&cloud.CloudContainerRegistrySpec.Region, "region", "", "Region for the container registry (e.g., DE, GRA, BHS)")
 	addParameterFileFlags(createCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/containerRegistry", "post", cloud.CloudContainerRegistryCreateSample, nil)
 	addInteractiveEditorFlag(createCmd)
-	createCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(createCmd, "from-file", "editor")
 	registryCmd.AddCommand(createCmd)
 
 	registryCmd.AddCommand(&cobra.Command{
@@ -102,7 +102,7 @@ func initContainerRegistryUsersCommand(registryCmd *cobra.Command) {
 	createCmd.Flags().StringVar(&cloud.CloudContainerRegistryUserSpec.Login, "login", "", "User login")
 	addParameterFileFlags(createCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/containerRegistry/{registryId}/users", "post", cloud.CloudContainerRegistryUserCreateSample, nil)
 	addInteractiveEditorFlag(createCmd)
-	createCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(createCmd, "from-file", "editor")
 	usersCmd.AddCommand(createCmd)
 
 	usersCmd.AddCommand(&cobra.Command{
@@ -137,7 +137,7 @@ func initContainerRegistryIAMCommand(registryCmd *cobra.Command) {
 	enableCmd.Flags().BoolVar(&cloud.CloudContainerRegistryIamSpec.DeleteUsers, "delete-users", false, "Delete existing container registry users when enabling IAM")
 	addParameterFileFlags(enableCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/containerRegistry/{registryId}/iam", "post", cloud.CloudContainerRegistryIamEnableSample, nil)
 	addInteractiveEditorFlag(enableCmd)
-	enableCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(enableCmd, "from-file", "editor")
 	iamCmd.AddCommand(enableCmd)
 
 	iamCmd.AddCommand(&cobra.Command{
@@ -276,7 +276,7 @@ func initContainerRegistryOIDCCommand(registryCmd *cobra.Command) {
 	createCmd.Flags().BoolVar(&cloud.CloudContainerRegistryOidcCreateSpec.Provider.VerifyCert, "verify-cert", false, "Verify the provider TLS certificate")
 	addParameterFileFlags(createCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/containerRegistry/{registryID}/openIdConnect", "post", cloud.CloudContainerRegistryOidcCreateSample, nil)
 	addInteractiveEditorFlag(createCmd)
-	createCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(createCmd, "from-file", "editor")
 	oidcCmd.AddCommand(createCmd)
 
 	editCmd := &cobra.Command{

internal/cmd/cloud_database.go

@@ -119,7 +119,7 @@ There are two ways to define the creation parameters:
 	databaseCreateCmd.Flags().IntVar(&cloud.DatabaseSpec.Disk.Size, "disk-size", 0, "Disk size (GB)")
 	databaseCreateCmd.Flags().StringVar(&cloud.DatabaseSpec.ForkFrom.BackupID, "fork-from.backup-id", "", "Backup ID (not compatible with fork-from.point-in-time)")
 	databaseCreateCmd.Flags().StringVar(&cloud.DatabaseSpec.ForkFrom.PointInTime, "fork-from.point-in-time", "", "Point in time to restore from (not compatible with fork-from.backup-id)")
-	databaseCreateCmd.MarkFlagsMutuallyExclusive("fork-from.backup-id", "fork-from.point-in-time")
+	markFlagsMutuallyExclusive(databaseCreateCmd, "fork-from.backup-id", "fork-from.point-in-time")
 	databaseCreateCmd.Flags().StringVar(&cloud.DatabaseSpec.ForkFrom.ServiceID, "fork-from.service-id", "", "Service ID that owns the backups")
 	databaseCreateCmd.Flags().StringVar(&cloud.DatabaseSpec.MaintenanceTime, "maintenance-time", "", "Time on which maintenances can start every day")
 	databaseCreateCmd.Flags().StringVar(&cloud.DatabaseSpec.Plan, "plan", "", "Database plan (you can get the list of available plans using 'ovhcloud cloud reference database list-plans')")
@@ -137,9 +137,9 @@ There are two ways to define the creation parameters:
 
 	// Nodes list definition
 	databaseCreateCmd.Flags().StringSliceVar(&cloud.DatabaseSpec.CLINodesList, "nodes-list", nil, "List of nodes (format: flavor1:region1,flavor2:region2...)")
-	databaseCreateCmd.MarkFlagsMutuallyExclusive("nodes-pattern.flavor", "nodes-list")
-	databaseCreateCmd.MarkFlagsMutuallyExclusive("nodes-pattern.number", "nodes-list")
-	databaseCreateCmd.MarkFlagsMutuallyExclusive("nodes-pattern.region", "nodes-list")
+	markFlagsMutuallyExclusive(databaseCreateCmd, "nodes-pattern.flavor", "nodes-list")
+	markFlagsMutuallyExclusive(databaseCreateCmd, "nodes-pattern.number", "nodes-list")
+	markFlagsMutuallyExclusive(databaseCreateCmd, "nodes-pattern.region", "nodes-list")
 
 	// Common flags for other mean to define parameters
 	addInteractiveEditorFlag(databaseCreateCmd)

internal/cmd/cloud_instance.go

@@ -77,19 +77,19 @@ There are three ways to define the creation parameters:
 	// Boot options
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.BootFrom.ImageID, "boot-from.image", "", "Image ID to boot from (you can use 'ovhcloud cloud reference list-images' to get the image ID or 'ovhcloud cloud instance snapshot ls' to get the snapshots)")
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.BootFrom.VolumeID, "boot-from.volume", "", "Volume ID to boot from")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("boot-from.image", "boot-from.volume")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "boot-from.image", "boot-from.volume")
 
 	// Private Network - Floating IP
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.FloatingIp.ID, "network.private.floating-ip.id", "", "ID of an existing floating IP")
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.FloatingIpCreate.Description, "network.private.floating-ip.create.description", "", "Description for the floating IP to create")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.floating-ip.id", "network.private.floating-ip.create.description")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.floating-ip.id", "network.private.floating-ip.create.description")
 
 	// Private Network - Gateway
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.Gateway.ID, "network.private.gateway.id", "", "ID of the existing gateway to attach to the private network")
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.GatewayCreate.Model, "network.private.gateway.create.model", "", "Model for the gateway to create (s, m, l)")
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.GatewayCreate.Name, "network.private.gateway.create.name", "", "Name for the gateway to create")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.gateway.id", "network.private.gateway.create.model")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.gateway.id", "network.private.gateway.create.name")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.gateway.id", "network.private.gateway.create.model")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.gateway.id", "network.private.gateway.create.name")
 
 	// Private network - IP
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Network.Private.IP, "network.private.ip", "", "Instance IP in the private network")
@@ -104,12 +104,12 @@ There are three ways to define the creation parameters:
 	instanceCreateCmd.Flags().BoolVar(&cloud.InstanceCreationParameters.Network.Private.NetworkCreate.Subnet.EnableDhcp, "network.private.create.subnet-enable-dhcp", false, "Enable DHCP for the subnet to create")
 	instanceCreateCmd.Flags().IntVar(&cloud.InstanceCreationParameters.Network.Private.NetworkCreate.Subnet.IPVersion, "network.private.create.subnet-ip-version", 0, "IP version for the subnet to create")
 	instanceCreateCmd.Flags().IntVar(&cloud.InstanceCreationParameters.Network.Private.NetworkCreate.VlanID, "network.private.create.vlan-id", 0, "VLAN ID for the private network to create")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.id", "network.private.create.name")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.id", "network.private.create.name")
 
 	// Network - Public
 	instanceCreateCmd.Flags().BoolVar(&cloud.InstanceCreationParameters.Network.Public, "network.public", false, "Set the new instance as public")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.id", "network.public")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("network.private.create.name", "network.public")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.id", "network.public")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "network.private.create.name", "network.public")
 
 	// Autobackup
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.Autobackup.Cron, "backup-cron", "", "Autobackup Unix Cron pattern (eg: '0 0 * * *')")
@@ -121,8 +121,8 @@ There are three ways to define the creation parameters:
 	// SSH Key Creation
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.SshKeyCreate.Name, "ssh-key.create.name", "", "Name for the SSH key to create")
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.SshKeyCreate.PublicKey, "ssh-key.create.public-key", "", "Public key for the SSH key to create")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("ssh-key.name", "ssh-key.create.name")
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("ssh-key.name", "ssh-key.create.public-key")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "ssh-key.name", "ssh-key.create.name")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "ssh-key.name", "ssh-key.create.public-key")
 
 	// User Data
 	instanceCreateCmd.Flags().StringVar(&cloud.InstanceCreationParameters.UserData, "user-data", "", "Configuration information or scripts to use upon launch")
@@ -135,7 +135,7 @@ There are three ways to define the creation parameters:
 		instanceCreateCmd.Flags().BoolVar(&cloud.InstanceImageViaInteractiveSelector, "image-selector", false, "Use the interactive image selector")
 		instanceCreateCmd.Flags().BoolVar(&cloud.InstanceFlavorViaInteractiveSelector, "flavor-selector", false, "Use the interactive flavor selector")
 	}
-	instanceCreateCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(instanceCreateCmd, "from-file", "editor")
 
 	return instanceCreateCmd
 }
@@ -284,8 +284,8 @@ There are three ways to define the installation parameters:
 	reinstallCmd.Flags().BoolVar(&flags.WaitForTask, "wait", false, "Wait for reinstall to be done before exiting")
 	if !(runtime.GOARCH == "wasm" && runtime.GOOS == "js") {
 		reinstallCmd.Flags().BoolVar(&cloud.InstanceImageViaInteractiveSelector, "image-selector", false, "Use the interactive image selector to define installation parameters")
-		reinstallCmd.MarkFlagsMutuallyExclusive("from-file", "editor", "image-selector")
 	}
+	markFlagsMutuallyExclusive(reinstallCmd, "from-file", "editor", "image-selector")
 	instanceCmd.AddCommand(reinstallCmd)
 
 	instanceCmd.AddCommand(&cobra.Command{

internal/cmd/cloud_kube.go

@@ -110,7 +110,7 @@ func initKubeCommand(cloudCmd *cobra.Command) {
 	}
 	ipRestrictionsEditCmd.Flags().StringSliceVar(&cloud.KubeIPRestrictions, "ips", nil, "List of IPs to restrict access to the Kubernetes cluster")
 	addInteractiveEditorFlag(ipRestrictionsEditCmd)
-	ipRestrictionsEditCmd.MarkFlagsMutuallyExclusive("ips", "editor")
+	markFlagsMutuallyExclusive(ipRestrictionsEditCmd, "ips", "editor")
 	ipRestrictionsCmd.AddCommand(ipRestrictionsEditCmd)
 
 	kubeConfigCmd := &cobra.Command{
@@ -365,7 +365,7 @@ There are three ways to define the creation parameters:
 	// Common flags for other means to define parameters
 	addParameterFileFlags(kubeCreateCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/kube", "post", cloud.CloudKubeCreationExample, nil)
 	addInteractiveEditorFlag(kubeCreateCmd)
-	kubeCreateCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(kubeCreateCmd, "from-file", "editor")
 
 	return kubeCreateCmd
 }
@@ -450,7 +450,7 @@ There are three ways to define the reset parameters:
 	// Common flags for other means to define parameters
 	addParameterFileFlags(kubeResetCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/kube/reset", "post", cloud.CloudKubeResetExample, nil)
 	addInteractiveEditorFlag(kubeResetCmd)
-	kubeResetCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(kubeResetCmd, "from-file", "editor")
 
 	return kubeResetCmd
 }
@@ -567,8 +567,8 @@ There are three ways to define the creation parameters:
 	addInteractiveEditorFlag(nodepoolCreateCmd)
 	if !(runtime.GOARCH == "wasm" && runtime.GOOS == "js") {
 		nodepoolCreateCmd.Flags().BoolVar(&cloud.InstanceFlavorViaInteractiveSelector, "flavor-selector", false, "Use the interactive flavor selector")
-		nodepoolCreateCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
 	}
+	markFlagsMutuallyExclusive(nodepoolCreateCmd, "from-file", "editor")
 
 	return nodepoolCreateCmd
 }
@@ -632,7 +632,7 @@ There are three ways to define the parameters:
 	// Common flags for other means to define parameters
 	addParameterFileFlags(createCmd, false, assets.CloudOpenapiSchema, "/cloud/project/{serviceName}/kube/{kubeId}/openIdConnect", "post", cloud.CloudKubeOIDCCreationExample, nil)
 	addInteractiveEditorFlag(createCmd)
-	createCmd.MarkFlagsMutuallyExclusive("from-file", "editor")
+	markFlagsMutuallyExclusive(createCmd, "from-file", "editor")
 
 	return createCmd
 }