readme changes and some more messages today

Signed-off-by: Pravin Pushkar <[email protected]>

Author: pravinpushkar

README.md

@@ -86,7 +86,7 @@ Output should look like so:
 
 ```
 ⌛  Making the jump to hyperspace...
-✅  Downloaded binaries and completed components set up.
+✅  Downloaded binaries and completed resources set up.
 ℹ️  daprd binary has been installed to  $HOME/.dapr/bin.
 ℹ️  dapr_placement container is running.
 ℹ️  dapr_redis container is running.
@@ -99,10 +99,12 @@ Output should look like so:
 
 This step creates the following defaults:
 
-1. components folder which is later used during `dapr run` unless the `--resources-path` (`--components-path` is deprecated and will be removed in future releases) option is provided. For Linux/MacOS, the default components folder path is `$HOME/.dapr/components` and for Windows it is `%USERPROFILE%\.dapr\components`.
-2. component files in the components folder called `pubsub.yaml` and `statestore.yaml`.
+1. resources folder which is later used during `dapr run` unless the `--resources-path` (`--components-path` is deprecated and will be removed in future releases) option is provided. For Linux/MacOS, the default resources folder path is `$HOME/.dapr/resources` and for Windows it is `%USERPROFILE%\.dapr\resources`.
+2. resoources files in the resources folder called `pubsub.yaml` and `statestore.yaml`.
 3. default config file `$HOME/.dapr/config.yaml` for Linux/MacOS or for Windows at `%USERPROFILE%\.dapr\config.yaml` to enable tracing on `dapr init` call. Can be overridden with the `--config` flag on `dapr run`.
 
+> Note: If there is a `components` directory present in the default dapr installation path `$HOME/.dapr/resources` (for Linux/MacOS) or `%USERPROFILE%\.dapr\resources` (for windows) then `dapr init` will copy the `resources` from the `components` to `resources` directory. This is to ensure safe migration from using `components` to `resources` directory.
+
 #### Slim Init
 
 Alternatively to the above, to have the CLI not install any default configuration files or run Docker containers, use the `--slim` flag with the init command. Only Dapr binaries will be installed.
@@ -115,13 +117,15 @@ Output should look like so:
 
 ```bash
 ⌛  Making the jump to hyperspace...
-✅  Downloaded binaries and completed components set up.
+✅  Downloaded binaries and completed resources set up.
 ℹ️  daprd binary has been installed to $HOME/.dapr/bin.
 ℹ️  placement binary has been installed.
 ✅  Success! Dapr is up and running. To get started, go here: https://aka.ms/dapr-getting-started
 ```
 
->Note: When initializing Dapr with the `--slim` flag only the Dapr runtime binary and the placement service binary are installed. An empty default components folder is created with no default configuration files. During `dapr run` user should use `--resources-path` (`--components-path` is deprecated and will be removed in future releases) to point to a components directory with custom configurations files or alternatively place these files in the default directory. For Linux/MacOS, the default components directory path is `$HOME/.dapr/components` and for Windows it is `%USERPROFILE%\.dapr\components`.
+>Note: When initializing Dapr with the `--slim` flag only the Dapr runtime binary and the placement service binary are installed. An empty default `resources` folder is created with no default configuration files. During `dapr run` user should use `--resources-path` (`--components-path` is deprecated and will be removed in future releases) to point to a `resources` directory with custom configurations files or alternatively place these files in the default directory. For Linux/MacOS, the default `resources` directory path is `$HOME/.dapr/resources` and for Windows it is `%USERPROFILE%\.dapr\resources`.
+
+> Note: If there is a `components` directory present in the default dapr installation path `$HOME/.dapr/resources` (for Linux/MacOS) or `%USERPROFILE%\.dapr\resources` (for windows) then `dapr init` will copy the `resources` from the `components` to `resources` directory. This is to ensure safe migration from using `components` to `resources` directory.
 
 #### Install a specific runtime version
 
@@ -325,7 +329,7 @@ To remove all Dapr Custom Resource Definitions:
 dapr uninstall -k --all
 ```
 
-*Warning: this will remove any components, subscriptions or configurations that are applied in the cluster at the time of deletion.*
+*Warning: this will remove any resources(and components also), subscriptions or configurations that are applied in the cluster at the time of deletion.*
 
 ### Upgrade Dapr on Kubernetes
 
@@ -444,7 +448,7 @@ Launch Dapr and your app:
 dapr run --app-id nodeapp --app-port 3000 node app.js
 ```
 
-Note: To choose a non-default components folder, use the --resources-path(--components-path is deprecated) option.
+Note: To choose a non-default resources folder, use the --resources-path(--components-path is deprecated) option.
 
 Invoke your app:
 

pkg/standalone/standalone.go

@@ -279,9 +279,9 @@ func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMod
 
 	stopSpinning(print.Success)
 
-	msg = "Downloaded binaries and completed components set up."
+	msg = "Downloaded binaries and completed resources set up."
 	if isAirGapInit {
-		msg = "Extracted binaries and completed components set up."
+		msg = "Extracted binaries and completed resources set up."
 	}
 	print.SuccessStatusEvent(os.Stdout, msg)
 	print.InfoStatusEvent(os.Stdout, "%s binary has been installed to %s.", daprRuntimeFilePrefix, daprBinDir)

tests/e2e/standalone/upgrade_test.go

@@ -53,6 +53,7 @@ func TestCompToResrcDirMig(t *testing.T) {
 	renameResourcesDir(t)
 
 	// dapr run should work with only components dir.
+	// 2nd paramter is true to indicate that only components dir is present.
 	checkDaprRunPrecedenceTest(t, true)
 
 	// dapr uninstall without --all flag should work.
@@ -65,6 +66,7 @@ func TestCompToResrcDirMig(t *testing.T) {
 	copyInMemStateStore(t)
 
 	// check dapr run precedence order, resources dir 1st then components dir.
+	// 2nd paramter is false to indicate that both components and resources dir are present.
 	checkDaprRunPrecedenceTest(t, false)
 }