From cb7215131194ff58656a47f9cce0d624991d99fc Mon Sep 17 00:00:00 2001 From: Aaron Steers <18150651+aaronsteers@users.noreply.github.com> Date: Fri, 21 Feb 2020 11:52:04 -0800 Subject: [PATCH 1/3] updated choco install cmd --- .github/workflows/markdown_checks.yml | 2 +- .tests/wsl-install-test.Dockerfile | 2 +- choco_devops.bat | 2 +- deploying_tableau_server_on_aws.md | 8 ++++---- windows_development.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/markdown_checks.yml b/.github/workflows/markdown_checks.yml index a5417ac..818751e 100644 --- a/.github/workflows/markdown_checks.yml +++ b/.github/workflows/markdown_checks.yml @@ -34,4 +34,4 @@ jobs: - name: Install link validator run: sudo -H -E npm install --global remark-cli remark-validate-links - name: Check for broken links (404 errors) - run: remark -u validate-links . + run: remark --frail -u validate-links . diff --git a/.tests/wsl-install-test.Dockerfile b/.tests/wsl-install-test.Dockerfile index 65baa18..5ecbe2d 100644 --- a/.tests/wsl-install-test.Dockerfile +++ b/.tests/wsl-install-test.Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/windows:1903 # Install chocolatey from chocolately.org -RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" +RUN @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" # Install core components RUN choco install --no-progress -y wsl diff --git a/choco_devops.bat b/choco_devops.bat index e2dd4fb..44d9a45 100644 --- a/choco_devops.bat +++ b/choco_devops.bat @@ -14,7 +14,7 @@ echo "Continuing script (with admin rights)..." echo on REM Installing Chocolatey - "The package manager for Windows"... -@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" +@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" REM Chocolatey install complete. REM Installing needed Windows features.... diff --git a/deploying_tableau_server_on_aws.md b/deploying_tableau_server_on_aws.md index b6533e7..54ea284 100644 --- a/deploying_tableau_server_on_aws.md +++ b/deploying_tableau_server_on_aws.md @@ -21,7 +21,7 @@ _**Overview:** This section walks through getting software installed and getting - Install minimal toolset from Command Prompt as administator (via [Chocolatey](https://chocolatey.org)): ```bat - @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" + @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" ``` ```bat @@ -149,8 +149,8 @@ _This section contains additional information which might be helpful, but is not
-- To get a better understanding of how this works to deploy a full environment in terraform, explore the code files in the `infra` folder of the `dataops-tools` repo, starting the files `infra/main.tf` and `infra/modules/aws-tableau/main.tf`. -- For information specifically on the Tableau Server config, see `infra/modules/aws-tableau/userdata_win.bat` (Windows) and `infra/modules/aws-tableau/userdata_lin.sh` (Linux). +- To get a better understanding of how this works to deploy a full environment in terraform, explore the code files in the `infra` folder of the `dataops-tools` repo, starting the files `infra/main.tf` and `infra/components/aws-tableau/main.tf`. +- For information specifically on the Tableau Server config, see `infra/components/aws-tableau/userdata_win.bat` (Windows) and `infra/components/aws-tableau/userdata_lin.sh` (Linux).
@@ -160,7 +160,7 @@ _This section contains additional information which might be helpful, but is not
-Whenever you modify the setup scripts in `infra/modules/aws-tableau` and then run `terraform apply`, terraform will detect the change to the script and will automatically rebuild the environment using the updated scripts. This means you can test different script options and configurations and rebuild everything in a single command.
+Whenever you modify the setup scripts in `infra/components/aws-tableau` and then run `terraform apply`, terraform will detect the change to the script and will automatically rebuild the environment using the updated scripts. This means you can test different script options and configurations and rebuild everything in a single command.
**Proceed with Caution:** While fully rebuilding the environment from scratch is extremely powerful, it also means you will be starting over from scratch each time. You will lose all settings, tableau workbooks, and data files which you may have deployed to the server(s).
diff --git a/windows_development.md b/windows_development.md
index 0a23018..5c8eb72 100644
--- a/windows_development.md
+++ b/windows_development.md
@@ -22,7 +22,7 @@ _**NOTE:**_
2. Paste and run the [Chocolatey.org](https://chocolatey.org/docs/installation#install-with-cmdexe) install script:
```cmd
- @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
+ @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
```
From 2e20e4991b4e64ef73aae966d98fcf545df0f16c Mon Sep 17 00:00:00 2001
From: Aaron Steers <18150651+aaronsteers@users.noreply.github.com>
Date: Fri, 21 Feb 2020 12:04:15 -0800
Subject: [PATCH 2/3] add troubleshooting section
---
windows_development.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/windows_development.md b/windows_development.md
index 5c8eb72..5429109 100644
--- a/windows_development.md
+++ b/windows_development.md
@@ -39,6 +39,8 @@ _**NOTE:**_
choco install -y choco-protocol-support chocolateygui docker-desktop python3 sudo terraform vscode
```
+- **NOTE:** See the [Troubleshooting](#troubleshooting) tips below if you run into any difficulties during this process.
+
## Installing additional tools
Click to install any of the below that would be useful for your project, or find additional packages at [chocolatey.org/packages](https://chocolatey.org/packages).
@@ -61,6 +63,14 @@ Click to install any of the below that would be useful for your project, or find
- [choco://wsl](choco://wsl)
- [choco://wsl-ubuntu-1804](choco://wsl-ubuntu-1804)
+## Troubleshooting
+
+If you run into issues during this process, here are some tips which might help:
+
+1. If the batch script approach does not appear to be working, it may be caused by security protections. Try the manual approach of copy-pasting the needed install command, and also make sure you are running the command prompt "as administrator".
+2. If the manual approach still does not work, try again to copy-paste the command [from here](https://chocolatey.org/docs/installation#install-with-cmdexe) on the Chocolatey.org website. _(The install command does not change often, but very occasionally there are security patches which require small adjustments to that process.)_
+3. If all else fails or if you find a bug in this documentation, please [click here to report the issue as a bug](https://github.com/slalom-ggp/dataops-docs/issues/new). So that we can provide the fastest response possible, please be sure to paste your error message and any other symptoms which may help in the debugging process.
+
## Related Links
- [Mac Development](mac_development.md)
From c88ba5657f937dd66a34d0bf972def5b7e2bb9ba Mon Sep 17 00:00:00 2001
From: Aaron Steers <18150651+aaronsteers@users.noreply.github.com>
Date: Fri, 21 Feb 2020 12:07:53 -0800
Subject: [PATCH 3/3] fix broken link
---
integrations/workday.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integrations/workday.md b/integrations/workday.md
index cf5f205..cc3a10d 100644
--- a/integrations/workday.md
+++ b/integrations/workday.md
@@ -32,7 +32,7 @@ After registering a report as a RaaS endpoint, you can then pull from that repor
### Standard Disclaimer
-_**Note:** Any "recommended" options are recommended solely by the author and come with no guarantees. If you know a better way, or if you have a suggestion to improve this page, please [create a pull request](../../CONTRIBUTING.md)."_
+_**Note:** Any "recommended" options are recommended solely by the author and come with no guarantees. If you know a better way, or if you have a suggestion to improve this page, please [create a pull request](/CONTRIBUTING.md)."_
### Additional Links