diff --git a/README.md b/README.md index 076b3907..b0f4779f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The Dapr CLI allows you to setup Dapr on your local dev machine or on a Kubernet **Windows** -Install the latest windows Dapr cli to `c:\dapr` and add this directory to User PATH environment variable. +Install the latest windows Dapr CLI to `c:\dapr` and add this directory to User PATH environment variable. ```powershell powershell -Command "iwr -useb https://raw.githubusercontent.com/dapr/cli/master/install/install.ps1 | iex" @@ -70,10 +70,10 @@ You can install or upgrade to a specific version of the Dapr runtime using `dapr # Install v0.1.0 runtime $ dapr init --runtime-version 0.1.0 -# Check the versions of cli and runtime +# Check the versions of CLI and runtime $ dapr --version -cli version: v0.1.0 -runtime version: v0.1.0 +CLI version: v0.1.0 +Runtime version: v0.1.0 ``` #### Install to a specific Docker network @@ -250,7 +250,7 @@ $ dapr list --kubernetes ### Stop Use ```dapr list``` to get a list of all running instances. -To stop an dapr app on your machine: +To stop a Dapr app on your machine: ``` $ dapr stop --app-id myAppID diff --git a/cmd/dapr.go b/cmd/dapr.go index 157865c6..e7917882 100644 --- a/cmd/dapr.go +++ b/cmd/dapr.go @@ -47,7 +47,7 @@ func Execute(version, apiVersion string) { } func setVersion() { - template := fmt.Sprintf("cli version: %s \nruntime version: %s", RootCmd.Version, version.GetRuntimeVersion()) + template := fmt.Sprintf("CLI version: %s \nRuntime version: %s", RootCmd.Version, version.GetRuntimeVersion()) RootCmd.SetVersionTemplate(template) } diff --git a/cmd/invoke.go b/cmd/invoke.go index b324d5a0..c6cfbe39 100644 --- a/cmd/invoke.go +++ b/cmd/invoke.go @@ -20,7 +20,7 @@ var invokePayload string var InvokeCmd = &cobra.Command{ Use: "invoke", - Short: "invoke a dapr app with an optional payload", + Short: "Invokes a Dapr app with an optional payload", Run: func(cmd *cobra.Command, args []string) { response, err := invoke.InvokeApp(invokeAppID, invokeAppMethod, invokePayload) if err != nil { diff --git a/cmd/list.go b/cmd/list.go index e2c86503..768a259c 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -19,7 +19,7 @@ import ( var ListCmd = &cobra.Command{ Use: "list", - Short: "List all dapr instances", + Short: "List all Dapr instances", Run: func(cmd *cobra.Command, args []string) { if kubernetesMode { list, err := kubernetes.List() @@ -43,7 +43,7 @@ var ListCmd = &cobra.Command{ } if len(list) == 0 { - fmt.Println("No dapr instances found.") + fmt.Println("No Dapr instances found.") return } diff --git a/cmd/run.go b/cmd/run.go index 0a3a095f..34235822 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -37,7 +37,7 @@ var protocol string var RunCmd = &cobra.Command{ Use: "run", - Short: "Launches dapr and your app side by side", + Short: "Launches Dapr and your app side by side", Args: cobra.MinimumNArgs(1), PreRun: func(cmd *cobra.Command, args []string) { viper.BindPFlag("placement-host", cmd.Flags().Lookup("placement-host")) diff --git a/cmd/stop.go b/cmd/stop.go index 5ca858fb..0afde60d 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -17,7 +17,7 @@ var stopAppID string var StopCmd = &cobra.Command{ Use: "stop", - Short: "Stops a running dapr instance and its associated app", + Short: "Stops a running Dapr instance and its associated app", Run: func(cmd *cobra.Command, args []string) { err := standalone.Stop(stopAppID) if err != nil { diff --git a/cmd/uninstall.go b/cmd/uninstall.go index 68e17b79..5a8e64ed 100644 --- a/cmd/uninstall.go +++ b/cmd/uninstall.go @@ -19,10 +19,10 @@ import ( var uninstallKubernetes bool var uninstallAll bool -// UninstallCmd is a command from removing an Dapr installation +// UninstallCmd is a command from removing a Dapr installation var UninstallCmd = &cobra.Command{ Use: "uninstall", - Short: "removes a dapr installation", + Short: "Removes a Dapr installation", PreRun: func(cmd *cobra.Command, args []string) { viper.BindPFlag("network", cmd.Flags().Lookup("network")) }, diff --git a/docs/development/development.md b/docs/development/development.md index 07dce49a..a44194ef 100644 --- a/docs/development/development.md +++ b/docs/development/development.md @@ -46,7 +46,7 @@ git clone https://github.com/dapr/cli.git github.com/dapr/cli ### Build the Dapr CLI -You can build dapr CLI binaries via `make` tool and find the binaries in `./dist/{os}_{arch}/release/`. +You can build Dapr CLI binaries via `make` tool and find the binaries in `./dist/{os}_{arch}/release/`. > Note : for windows environment with MinGW, use `mingw32-make.exe` instead of `make`. diff --git a/docs/reference/dapr-init.md b/docs/reference/dapr-init.md index 70743c2f..a67184b9 100644 --- a/docs/reference/dapr-init.md +++ b/docs/reference/dapr-init.md @@ -2,7 +2,7 @@ ## Description -Setup dapr in Kubernetes or Standalone modes +Setup Dapr in Kubernetes or Standalone modes ## Usage diff --git a/docs/reference/dapr-run.md b/docs/reference/dapr-run.md index 9d98306c..731f4b58 100644 --- a/docs/reference/dapr-run.md +++ b/docs/reference/dapr-run.md @@ -2,7 +2,7 @@ ## Description -Launches dapr and your app side-by-side +Launches Dapr and your app side-by-side ## Usage diff --git a/docs/reference/reference.md b/docs/reference/reference.md index 29c67c84..da69b318 100644 --- a/docs/reference/reference.md +++ b/docs/reference/reference.md @@ -18,17 +18,17 @@ Usage: Available Commands: help Help about any command - init Setup dapr in Kubernetes or Standalone modes - list List all dapr instances + init Setup Dapr in Kubernetes or Standalone modes + list List all Dapr instances publish Publish an event to multiple consumers - run Launches dapr and your app side by side - invoke Invoke a dapr app with an optional payload - stop Stops a running dapr instance and its associated app - uninstall Removes a dapr installation + run Launches Dapr and your app side by side + invoke Invokes a Dapr app with an optional payload + stop Stops a running Dapr instance and its associated app + uninstall Removes a Dapr installation Flags: - -h, --help help for dapr - --version version for dapr + -h, --help help for Dapr + --version version for Dapr Use "dapr [command] --help" for more information about a command. ``` diff --git a/install/install.ps1 b/install/install.ps1 index db04178d..1d8bdfce 100755 --- a/install/install.ps1 +++ b/install/install.ps1 @@ -10,7 +10,7 @@ $DaprRoot="c:\dapr" $DaprCliFileName = "dapr.exe" $DaprCliFilePath = "${DaprRoot}\${DaprCliFileName}" -# GitHub Org and repo hosting Dapr cli +# GitHub Org and repo hosting Dapr CLI $GitHubOrg="dapr" $GitHubRepo="cli" @@ -32,7 +32,7 @@ if((Get-ExecutionPolicy) -gt 'RemoteSigned' -or (Get-ExecutionPolicy) -eq 'ByPas # Change security protocol to support TLS 1.2 / 1.1 / 1.0 - old powershell uses TLS 1.0 as a default protocol [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls" -# Check if Dapr cli is installed. +# Check if Dapr CLI is installed. if (Test-Path $DaprCliFilePath -PathType Leaf) { Write-Warning "Dapr is detected - $DaprCliFilePath" Invoke-Expression "$DaprCliFilePath --version" @@ -57,7 +57,7 @@ if ($releases.Count -eq 0) { # Filter windows binary and download archive $windowsAsset = $releases[0].assets | where-object { $_.name -Like "*windows_amd64.zip" } if (!$windowsAsset) { - throw "Cannot find the windows dapr cli binary" + throw "Cannot find the windows Dapr CLI binary" } $zipFilePath = $DaprRoot + "\" + $windowsAsset.name @@ -76,7 +76,7 @@ if (!(Test-Path $DaprCliFilePath -PathType Leaf)) { throw "Failed to download Dapr Cli archieve - $zipFilePath" } -# Check the dapr cli version +# Check the Dapr CLI version Invoke-Expression "$DaprCliFilePath --version" # Clean up zipfile diff --git a/install/install.sh b/install/install.sh index 44242b05..13347569 100755 --- a/install/install.sh +++ b/install/install.sh @@ -127,7 +127,7 @@ installFile() { local tmp_root_dapr_cli="$DAPR_TMP_ROOT/$DAPR_CLI_FILENAME" if [ ! -f "$tmp_root_dapr_cli" ]; then - echo "Failed to unpack Dapr cli executable." + echo "Failed to unpack Dapr CLI executable." exit 1 fi diff --git a/pkg/standalone/run.go b/pkg/standalone/run.go index f3dc70e7..83932596 100644 --- a/pkg/standalone/run.go +++ b/pkg/standalone/run.go @@ -249,7 +249,7 @@ func Run(config *RunConfig) (*RunOutput, error) { for _, a := range dapr { if appID == a.AppID { - return nil, fmt.Errorf("dapr with ID %s is already running", appID) + return nil, fmt.Errorf("Dapr with ID %s is already running", appID) } } @@ -300,9 +300,9 @@ func Run(config *RunConfig) (*RunOutput, error) { for _, a := range dapr { if daprHTTPPort == a.HTTPPort { - return nil, fmt.Errorf("there's already a dapr instance running with http port %v", daprHTTPPort) + return nil, fmt.Errorf("there's already a Dapr instance running with http port %v", daprHTTPPort) } else if daprGRPCPort == a.GRPCPort { - return nil, fmt.Errorf("there's already a dapr instance running with gRPC port %v", daprGRPCPort) + return nil, fmt.Errorf("there's already a Dapr instance running with gRPC port %v", daprGRPCPort) } } diff --git a/pkg/standalone/standalone.go b/pkg/standalone/standalone.go index 3a0914da..0ee2fcee 100644 --- a/pkg/standalone/standalone.go +++ b/pkg/standalone/standalone.go @@ -269,7 +269,7 @@ func installDaprBinary(wg *sync.WaitGroup, errorChan chan<- error, dir, version filepath, err := downloadFile(dir, daprURL) if err != nil { - errorChan <- fmt.Errorf("Error downloading dapr binary: %s", err) + errorChan <- fmt.Errorf("Error downloading Dapr binary: %s", err) return } @@ -283,19 +283,19 @@ func installDaprBinary(wg *sync.WaitGroup, errorChan chan<- error, dir, version } if err != nil { - errorChan <- fmt.Errorf("Error extracting dapr binary: %s", err) + errorChan <- fmt.Errorf("Error extracting Dapr binary: %s", err) return } daprPath, err := moveFileToPath(extractedFilePath) if err != nil { - errorChan <- fmt.Errorf("Error moving dapr binary to path: %s", err) + errorChan <- fmt.Errorf("Error moving Dapr binary to path: %s", err) return } err = makeExecutable(daprPath) if err != nil { - errorChan <- fmt.Errorf("Error making dapr binary executable: %s", err) + errorChan <- fmt.Errorf("Error making Dapr binary executable: %s", err) return } diff --git a/vendor/github.com/dapr/dapr/pkg/apis/components/v1alpha1/types.go b/vendor/github.com/dapr/dapr/pkg/apis/components/v1alpha1/types.go index c9d938e2..01a4b2b1 100644 --- a/vendor/github.com/dapr/dapr/pkg/apis/components/v1alpha1/types.go +++ b/vendor/github.com/dapr/dapr/pkg/apis/components/v1alpha1/types.go @@ -13,7 +13,7 @@ import ( // +genclient:noStatus // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// Component describes an Dapr component type +// Component describes a Dapr component type type Component struct { metav1.TypeMeta `json:",inline"` // +optional diff --git a/vendor/github.com/dapr/dapr/pkg/components/standalone_loader.go b/vendor/github.com/dapr/dapr/pkg/components/standalone_loader.go index 1cf164e2..84d17bdf 100644 --- a/vendor/github.com/dapr/dapr/pkg/components/standalone_loader.go +++ b/vendor/github.com/dapr/dapr/pkg/components/standalone_loader.go @@ -27,7 +27,7 @@ func NewStandaloneComponents(configuration config.StandaloneConfig) *StandaloneC } } -// LoadComponents loads dapr components from a given directory +// LoadComponents loads Dapr components from a given directory func (s *StandaloneComponents) LoadComponents() ([]components_v1alpha1.Component, error) { dir := s.config.ComponentsPath files, err := ioutil.ReadDir(dir) diff --git a/vendor/github.com/docker/docker/client/client.go b/vendor/github.com/docker/docker/client/client.go index a9bdab6b..10ef46b0 100644 --- a/vendor/github.com/docker/docker/client/client.go +++ b/vendor/github.com/docker/docker/client/client.go @@ -222,7 +222,6 @@ func (cli *Client) UpdateClientVersion(v string) { if !cli.manualOverride { cli.version = v } - } // ParseHost verifies that the given host strings is valid.