replaced az resource commands

Author: spelluru

articles/event-grid/custom-event-to-hybrid-connection.md

@@ -47,11 +47,11 @@ You subscribe to an Event Grid topic to tell Event Grid which events you want to
 The following script gets the resource ID of the relay namespace. It constructs the ID for the hybrid connection, and subscribes to an Event Grid topic. The script sets the endpoint type to `hybridconnection` and uses the hybrid connection ID for the endpoint.
 
 ```azurecli-interactive
-relayname=<namespace-name>
+relaynsname=<namespace-name>
 relayrg=<resource-group-for-relay>
 hybridname=<hybrid-name>
 
-relayid=$(az resource show --name $relayname --resource-group $relayrg --resource-type Microsoft.Relay/namespaces --query id --output tsv)
+relayid=$(az relay namespace show --resource-group $relayrg --name $relaynsname --query id --output tsv)
 hybridid="$relayid/hybridConnections/$hybridname"
 topicid=$(az eventgrid topic show --name <topic_name> -g gridResourceGroup --query id --output tsv)
 

articles/event-grid/how-to-filter-events.md

@@ -124,7 +124,7 @@ New-AzEventGridSubscription `
 In the following Azure CLI example, you create an event subscription that filters by the beginning of the subject. You use the `--subject-begins-with` parameter to limit events to ones for a specific resource. You pass the resource ID of a network security group.
 
 ```azurecli
-resourceId=$(az resource show --name demoSecurityGroup --resource-group myResourceGroup --resource-type Microsoft.Network/networkSecurityGroups --query id --output tsv)
+resourceId=$(az network nsg show -g myResourceGroup -n demoSecurityGroup --query id --output tsv)
 
 az eventgrid event-subscription create \
   --name demoSubscriptionToResourceGroup \

articles/event-grid/mqtt-certificate-chain-client-authentication.md

@@ -78,18 +78,19 @@ Using the CA files generated to create certificate for the client.
 Use the following commands to upload/show/delete a certificate authority (CA) certificate to the service
 
 **Upload certificate authority root or intermediate certificate**
+
 ```azurecli-interactive
-az resource create --resource-type Microsoft.EventGrid/namespaces/caCertificates --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/caCertificates/`CA certificate name` --api-version  --properties @./resources/ca-cert.json
+az eventgrid namespace ca-certificate create -g myRG --namespace-name myNS -n myCertName --certificate @./resources/ca-cert.json
 ```
 
 **Show certificate information**
 ```azurecli-interactive
-az resource show --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/caCertificates/`CA certificate name`
+az eventgrid namespace ca-certificate show -g myRG --namespace-name myNS -n myCertName
 ```
 
 **Delete certificate**
 ```azurecli-interactive
-az resource delete --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/caCertificates/`CA certificate name`
+az eventgrid namespace ca-certificate delete -g myRG --namespace-name myNS -n myCertName
 ```
 
 ## Next steps

articles/event-grid/mqtt-client-groups.md

@@ -77,17 +77,17 @@ Use the following commands to create/show/delete a client group
 
 **Create client group**
 ```azurecli-interactive
-az resource create --resource-type Microsoft.EventGrid/namespaces/clientGroups --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clientGroups/`Client Group Name` --api-version 2023-06-01-preview --properties @./resources/CG.json
+az eventgrid namespace client-group create -g myRG --namespace-name myNS -n myCG 
 ```
 
 **Get client group**
 ```azurecli-interactive
-az resource show --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clientGroups/`Client group name` |
+az eventgrid namespace client-group show -g myRG --namespace-name myNS -n myCG
 ```
 
 **Delete client group**
 ```azurecli-interactive
-az resource delete --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clientGroups/`Client group name` |
+az eventgrid namespace client-group delete -g myRG --namespace-name myNS -n myCG
 ```
 
 ## Next steps

articles/event-grid/mqtt-clients.md

@@ -156,17 +156,17 @@ Use the following commands to create/show/delete a client
 
 **Create client**
 ```azurecli-interactive
- az resource create --resource-type Microsoft.EventGrid/namespaces/clients --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clients/`Client name` --api-version 2023-06-01-preview --properties @./resources/client.json
+az eventgrid namespace client create -g myRG --namespace-name myNS -n myClient
 ```
 
 **Get client**
 ```azurecli-interactive
-az resource show --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clients/`Client name`
+az eventgrid namespace client show -g myRG --namespace-name myNS -n myClient
 ```
 
 **Delete client**
 ```azurecli-interactive
-az resource delete --id /subscriptions/`Subscription ID`/resourceGroups/`Resource Group`/providers/Microsoft.EventGrid/namespaces/`Namespace Name`/clients/`Client name`
+az eventgrid namespace client delete -g myRG --namespace-name myNS -n myClient
 ```
 
 ## Next steps

articles/event-grid/mqtt-publish-and-subscribe-cli.md

@@ -93,7 +93,7 @@ az eventgrid namespace topic-space create -g {Resource Group} --namespace-name {
 
 ## Create permission bindings
 
-Use the `az resource` command to create the first permission binding for publisher permission. Update the command with your resource group, namespace name, and permission binding name.
+Use the `az eventgrid` command to create the first permission binding for publisher permission. Update the command with your resource group, namespace name, and permission binding name.
 
 ```azurecli-interactive
 az eventgrid namespace permission-binding create -g {Resource Group} --namespace-name {Namespace Name} -n {Permission Binding Name} --client-group-name '$all' --permission publisher --topic-space-name {Topicspace Name}

articles/event-grid/mqtt-topic-spaces.md

@@ -84,21 +84,7 @@ Use the following steps to create a topic space:
 
 Use the following commands to create a topic space:
 ```azurecli-interactive
-az resource create --resource-type Microsoft.EventGrid/namespaces/topicSpaces --id /subscriptions/<Subscription ID>/resourceGroups/<Resource Group>/providers/Microsoft.EventGrid/namespaces/<Namespace Name>/topicSpaces/<Topic Space Name> --is-full-object --api-version 2023-06-01-preview --properties @./resources/TS.json
-```
-
-**TS.json:**
-```json
-{ 
-    "properties": {
-        "topicTemplates": [
-            "segment1/+/segment3/${client.authenticationName}",
-            "segment1/${client.attributes.attribute1}/segment3/#"
-        ]
-
-    }
-
-}
+az eventgrid namespace topic-space create -g myRG --namespace-name myNS -n myTopicSpace --topic-templates ['segment1/+/segment3/${client.authenticationName}', "segment1/${client.attributes.attribute1}/segment3/#"]
 ```
 
 > [!NOTE]

articles/event-grid/query-event-subscriptions.md

@@ -139,7 +139,7 @@ To get event grid subscriptions for a particular resource, provide the resource
 For Azure CLI, use:
 
 ```azurecli-interactive
-resourceid=$(az resource show -n mystorage -g myResourceGroup --resource-type "Microsoft.Storage/storageaccounts" --query id --output tsv)
+resourceid=$(az storage account show -g myResourceGroup -n myStorageAccount --query id --output tsv)
 az eventgrid event-subscription list --resource-id $resourceid
 ```