Ensure that disagreeing to provider ToS will abort provisioning

superfly · Oct 12, 2023 · df6c3de · df6c3de
1 parent 08aa3a4
commit df6c3de
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/internal/command/extensions/core/core.go b/internal/command/extensions/core/core.go
@@ -231,7 +231,7 @@ func AgreeToProviderTos(ctx context.Context, provider gql.ExtensionProviderData,
 	}
 
 	// Prompt the user to agree to the provider ToS
-	confirmTos, err := prompt.Confirm(ctx, fmt.Sprintf("To provision this %s, you must agree on behalf of your organization to the %s Terms Of Service at %s. Do you agree?", provider.ResourceName, provider.DisplayName, provider.TosUrl))
+	confirmTos, err := prompt.Confirm(ctx, fmt.Sprintf("To provision %s %ss, you must agree on behalf of your organization to the %s Terms Of Service at %s. Do you agree?", provider.DisplayName, provider.ResourceName, provider.DisplayName, provider.TosUrl))
 
 	if err != nil {
 		return err
@@ -242,6 +242,8 @@ func AgreeToProviderTos(ctx context.Context, provider gql.ExtensionProviderData,
 			AddOnProviderName: provider.Name,
 			OrganizationId:    org.Id,
 		})
+	} else {
+		return errors.New(fmt.Sprintf("%s provisioning stopped.", provider.DisplayName))
 	}
 
 	return err