Merge branch 'main' into rynowak/fix-config

cadl/Applications.Link/daprPubSubBrokers.cadl

@@ -38,70 +38,35 @@ using OpenAPI;
   title: "Applications.Link Management APIs",
   version: "2022-03-15-privatepreview",
 })
-@doc("REST APIs for Applications.Link/daprPubSubBrokers")
+@doc("REST APIs for Applications.Link DaprPubSubBroker Resource")
 @versionedDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
 namespace Applications.Link;
 
-@doc("DaprPubSubBroker Properties for Mode Resource")
-model ResourceDaprPubSubProperties extends DaprPubSubBrokerProperties{
-  @doc("How to build the DaprPubSubBroker link. Options are to build automatically via 'recipe' or 'resource', or build manually via 'values'. Selection determines which set of fields to additionally require.")
-  mode: "resource";
-
-  @doc("Metadata for the pub sub resource. This should match the values specified in Dapr component spec")
-  metadata?: object;
-
-  @doc("Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.")
-  type?: string;
-
-  @doc("Dapr component version")
-  version?: string;
-
-  @doc("PubSub resource")
-  resource: string;
-}
-
-@doc("DaprPubSubBroker Properties for Mode Values")
-model ValuesDaprPubSubProperties extends DaprPubSubBrokerProperties{
-  @doc("How to build the DaprPubSubBroker link. Options are to build automatically via 'recipe' or 'resource', or build manually via 'values'. Selection determines which set of fields to additionally require.")
-  mode: "values";
-
-  @doc("Metadata for the pub sub resource. This should match the values specified in Dapr component spec")
-  metadata: object;
+@doc("DaprPubSubBroker link properties")
+model DaprPubSubBrokerProperties extends BasicDaprResourceProperties {
+  @doc("Provisioning state of the daprPubSubBroker resource at the time the operation was called")
+  @visibility("read")
+  provisioningState?: ProvisioningState;
 
-  @doc("Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.")
-  type: string;
+  @doc("Specifies how the underlying service/resource is provisioned and managed.")
+  resourceProvisioning?: ResourceProvisioning;
 
-  @doc("Dapr component version")
-  version: string;
-}
+  @doc("Metadata for the daprPubSubBroker resource. This should match the values specified in Dapr component spec")
+  metadata?: object;
 
-@doc("DaprPubSubBroker Properties for Mode Recipe")
-model RecipeDaprPubSubProperties extends DaprPubSubBrokerProperties{
-  @doc("How to build the DaprPubSubBroker link. Options are to build automatically via 'recipe' or 'resource', or build manually via 'values'. Selection determines which set of fields to additionally require.")
-  mode: "recipe";
+  @doc("The recipe used to automatically deploy underlying infrastructure for the daprPubSubBroker link")
+  recipe?: Recipe;
 
-  @doc("Metadata for the pub sub resource. This should match the values specified in Dapr component spec")
-  metadata?: object;
+  @doc("A collection of references to resources associated with the daprPubSubBroker")
+  resources?: ResourceReference[];
 
-  @doc("Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.")
+  @doc("DaprPubSubBroker type. These strings match the format used by Dapr Kubernetes configuration format.")
   type?: string;
 
   @doc("Dapr component version")
   version?: string;
-
-  @doc("The recipe used to automatically deploy underlying infrastructure for the daprPubSub link")
-  recipe: Recipe;
 }
-@doc("DaprPubSubBroker link properties")
-@discriminator("mode")
-model DaprPubSubBrokerProperties extends BasicDaprResourceProperties {
-  @doc("Provisioning state of the daprPubSubBroker link at the time the operation was called")
-  @visibility("read")
-  provisioningState?: ProvisioningState;
 
-  @doc("Topic name of the Azure ServiceBus resource")
-  topic?: string;
-}
 @doc("DaprPubSubBroker link")
 model DaprPubSubBrokerResource is TrackedResource<DaprPubSubBrokerProperties> {
   @doc("DaprPubSubBroker name")
@@ -116,7 +81,7 @@ model DaprPubSubBrokerResource is TrackedResource<DaprPubSubBrokerProperties> {
 
 @armResourceOperations
 interface DaprPubSubBroker
-  extends Radius.ResourceOperationWithSyncDelete<
+  extends Radius.ResourceOperationWithAsyncDelete<
       DaprPubSubBrokerResource,
       DaprPubSubBrokerProperties,
       RootScopeParam

hack/bicep-types-radius/generated/applications/applications.link/2022-03-15-privatepreview/types.md

@@ -161,38 +161,22 @@
 * **Additional Properties Type**: string
 
 ## DaprPubSubBrokerProperties
-* **Discriminator**: mode
-
-### Base Properties
+### Properties
 * **application**: string: Fully qualified resource ID for the application that the link is consumed by
 * **componentName**: string (ReadOnly): The name of the Dapr component object. Use this value in your code when interacting with the Dapr client to use the Dapr component.
 * **environment**: string (Required): Fully qualified resource ID for the environment that the link is linked to
+* **metadata**: any: Any object
 * **provisioningState**: 'Accepted' | 'Canceled' | 'Deleting' | 'Failed' | 'Provisioning' | 'Succeeded' | 'Updating' (ReadOnly): Provisioning state of the link at the time the operation was called
+* **recipe**: [Recipe](#recipe): The recipe used to automatically deploy underlying infrastructure for a link
+* **resourceProvisioning**: 'manual' | 'recipe': Specifies how the underlying service/resource is provisioned and managed. Available values are 'recipe', where Radius manages the lifecycle of the resource through a Recipe, and 'manual', where a user manages the resource and provides the values.
+* **resources**: [ResourceReference](#resourcereference)[]: A collection of references to resources associated with the daprPubSubBroker
 * **status**: [ResourceStatus](#resourcestatus) (ReadOnly): Status of a resource.
-* **topic**: string: Topic name of the Azure ServiceBus resource
-### RecipeDaprPubSubProperties
-#### Properties
-* **metadata**: any: Any object
-* **mode**: 'recipe' (Required): Discriminator property for DaprPubSubBrokerProperties.
-* **recipe**: [Recipe](#recipe) (Required): The recipe used to automatically deploy underlying infrastructure for a link
-* **type**: string: Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.
+* **type**: string: DaprPubSubBroker type. These strings match the format used by Dapr Kubernetes configuration format.
 * **version**: string: Dapr component version
 
-### ResourceDaprPubSubProperties
-#### Properties
-* **metadata**: any: Any object
-* **mode**: 'resource' (Required): Discriminator property for DaprPubSubBrokerProperties.
-* **resource**: string (Required): PubSub resource
-* **type**: string: Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.
-* **version**: string: Dapr component version
-
-### ValuesDaprPubSubProperties
-#### Properties
-* **metadata**: any (Required): Any object
-* **mode**: 'values' (Required): Discriminator property for DaprPubSubBrokerProperties.
-* **type**: string (Required): Dapr PubSub type. These strings match the format used by Dapr Kubernetes configuration format.
-* **version**: string (Required): Dapr component version
-
+## ResourceReference
+### Properties
+* **id**: string (Required): Resource id of an existing resource
 
 ## TrackedResourceTags
 ### Properties
@@ -231,10 +215,6 @@
 * **type**: string: Dapr StateStore type. These strings match the format used by Dapr Kubernetes configuration format.
 * **version**: string: Dapr component version
 
-## ResourceReference
-### Properties
-* **id**: string (Required): Resource id of an existing resource
-
 ## TrackedResourceTags
 ### Properties
 ### Additional Properties

hack/bicep-types-radius/generated/index.json

@@ -1 +1 @@
-{"Resources":{"Applications.Core/environments@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":51},"Applications.Core/applications@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":75},"Applications.Core/httpRoutes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":89},"Applications.Core/gateways@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":110},"Applications.Core/containers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":175},"Applications.Core/volumes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":212},"Applications.Core/secretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":235},"Applications.Core/extenders@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":250},"Applications.Dapr/daprPubSubBrokers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":41},"Applications.Dapr/daprSecretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":59},"Applications.Dapr/daprStateStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":79},"Applications.Datastores/mongoDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":42},"Applications.Datastores/redisCaches@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":63},"Applications.Datastores/sqlDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":83},"Applications.Link/daprInvokeHttpRoutes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":35},"Applications.Link/daprPubSubBrokers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":55},"Applications.Link/daprSecretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":72},"Applications.Link/daprStateStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":91},"Applications.Link/mongoDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":112},"Applications.Link/rabbitMQMessageQueues@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":130},"Applications.Link/redisCaches@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":149},"Applications.Link/sqlDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":167},"Applications.Link/extenders@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":182},"Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview":{"RelativePath":"applications/applications.messaging/2022-03-15-privatepreview/types.json","Index":40}},"Functions":{"applications.core/secretstores":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":256}]},"applications.core/extenders":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":258}]},"applications.datastores/mongodatabases":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":85}]},"applications.datastores/rediscaches":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":87}]},"applications.link/mongodatabases":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":184}]},"applications.link/rabbitmqmessagequeues":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":186}]},"applications.link/rediscaches":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":188}]},"applications.link/extenders":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":190}]},"applications.messaging/rabbitmqqueues":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.messaging/2022-03-15-privatepreview/types.json","Index":42}]}}}
+{"Resources":{"Applications.Core/environments@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":51},"Applications.Core/applications@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":75},"Applications.Core/httpRoutes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":89},"Applications.Core/gateways@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":110},"Applications.Core/containers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":175},"Applications.Core/volumes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":212},"Applications.Core/secretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":235},"Applications.Core/extenders@2022-03-15-privatepreview":{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":250},"Applications.Dapr/daprPubSubBrokers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":41},"Applications.Dapr/daprSecretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":59},"Applications.Dapr/daprStateStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.dapr/2022-03-15-privatepreview/types.json","Index":79},"Applications.Datastores/mongoDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":42},"Applications.Datastores/redisCaches@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":63},"Applications.Datastores/sqlDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":83},"Applications.Link/daprInvokeHttpRoutes@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":35},"Applications.Link/daprPubSubBrokers@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":54},"Applications.Link/daprSecretStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":71},"Applications.Link/daprStateStores@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":89},"Applications.Link/mongoDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":110},"Applications.Link/rabbitMQMessageQueues@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":128},"Applications.Link/redisCaches@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":147},"Applications.Link/sqlDatabases@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":165},"Applications.Link/extenders@2022-03-15-privatepreview":{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":180},"Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview":{"RelativePath":"applications/applications.messaging/2022-03-15-privatepreview/types.json","Index":40}},"Functions":{"applications.core/secretstores":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":256}]},"applications.core/extenders":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.core/2022-03-15-privatepreview/types.json","Index":258}]},"applications.datastores/mongodatabases":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":85}]},"applications.datastores/rediscaches":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.datastores/2022-03-15-privatepreview/types.json","Index":87}]},"applications.link/mongodatabases":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":182}]},"applications.link/rabbitmqmessagequeues":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":184}]},"applications.link/rediscaches":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":186}]},"applications.link/extenders":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.link/2022-03-15-privatepreview/types.json","Index":188}]},"applications.messaging/rabbitmqqueues":{"2022-03-15-privatepreview":[{"RelativePath":"applications/applications.messaging/2022-03-15-privatepreview/types.json","Index":42}]}}}

pkg/azure/azresources/types.go

@@ -30,7 +30,6 @@ const (
 	ManagedIdentityUserAssignedIdentities      = "Microsoft.ManagedIdentity/userAssignedIdentities"
 	ServiceBusNamespaces                       = "Microsoft.ServiceBus/namespaces"
 	ServiceBusNamespacesQueues                 = "queues"
-	ServiceBusNamespacesTopics                 = "topics"
 	StorageStorageAccounts                     = "Microsoft.Storage/storageAccounts"
 	StorageStorageAccountsTables               = "tables"
 	StorageStorageTableServices                = "tableServices"

pkg/cli/cmd/radinit/aws.go

@@ -35,6 +35,8 @@ const (
 	enterAWSIAMSecretAccessKeyPrompt      = "Enter your IAM Secret Access Keys:"
 	enterAWSIAMSecretAccessKeyPlaceholder = "Enter IAM access key..."
 	errNotEmptyTemplate                   = "%s cannot be empty"
+
+	awsAccessKeysCreateInstructionFmt = "\nAWS IAM Access keys (Access key ID and Secret access key) are required to access and create AWS resources.\n\nFor example, you can create one using the following command:\n\033[36maws iam create-access-key\033[0m\n\nFor more information refer to https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html.\n\n"
 )
 
 func (r *Runner) enterAWSCloudProvider(ctx context.Context, options *initOptions) (*aws.Provider, error) {
@@ -45,6 +47,8 @@ func (r *Runner) enterAWSCloudProvider(ctx context.Context, options *initOptions
 		return nil, err
 	}
 
+	r.Output.LogInfo(awsAccessKeysCreateInstructionFmt)
+
 	accessKeyID, err := r.Prompter.GetTextInput(enterAWSIAMAcessKeyIDPrompt, prompt.TextInputOptions{Placeholder: enterAWSIAMAcessKeyIDPlaceholder})
 	if errors.Is(err, &prompt.ErrExitConsole{}) {
 		return nil, &cli.FriendlyError{Message: err.Error()}