Proxy support for Initial install and shell provisioners #229

daxgames · 2020-02-24T21:39:38Z

@arizvisa Merge my PRs in the order they were opened for best results. If merging all it should look like this when done.

They are all based on boxcutter/windows master branch.

The first 4 PRs do everything that was in #179

#229
#230
#232
#233

This is new based on issues encountered with New Packer 1.5.2

#234

Proxy support for Initial install and shell provisioners

Part of Prefix and proxy #179 so closing Prefix and proxy #179
Adds authenticated/unauthenticated http/https/no_proxy capability to _download.cmd for wget and powershell
- See README.md for configuration documentation.
- wget throws a lot of red onto the screen when using proxy so if proxy is configured powershell will be used. Note: this could be a configurable preferrence but I saw no need.
Moves powershell download to _download.cmd
documents use of floppy\_packer_config*.cmd
Add floppy/_packer_config_*.cmd to the .gitignore so users can customize without committing to this repo.

daxgames · 2020-02-24T21:46:49Z

@arizvisa Proxy support added.

daxgames · 2020-02-25T11:20:08Z

@arizvisa Still working on adding authenticated proxy.

daxgames · 2020-02-25T22:42:19Z

@arizvisa This is ready to go. Please ask if you have any questions.

arizvisa · 2020-02-28T22:20:09Z

Thanks for doing this work. My bad on merging the other ones before reading this. :-/

I just relocated, so I don't have all my equipment setup to simulate this properly. It's likely I'll be able to deploy a quick proxy and build more than a single VM sometime next week, though. However, I'll see what I can do over the weekend so you aren't stuck waiting too long.

daxgames · 2020-02-29T01:31:18Z

@arizvisa no worries. I oriiginally wrote a less capable version of the proxy support for this I think 3 years ago so I have been waiting for a while.

arizvisa · 2020-02-29T23:49:11Z

As semi-discussed in #83, the addition of allowing users to customize the configuration during the floppy step (which includes the update to all of the templates) is different from the consolidation of the download methods that you did to implement proxy support.

Can you isolate the configuration (along with the relevant paragraph of documentation) and all of the modifications to the templates into its own PR?

daxgames · 2020-03-01T02:11:50Z

@arizvisa It was done because it is absolutely required to configure proxy support during floppy step. So it is indeed part of the proxy support PR.

Edit: Let me explain. You don't want someone editing a file that is a part of this repo to add optional configuration. They should be able to add a file that is ignored by git as optional configuration.

arizvisa · 2020-03-02T21:06:43Z

Is it though? What's wrong with the pre-existing methodology of editing floppy/_packer_config.cmd?

daxgames · 2020-03-02T21:25:21Z

If you want to protect users and make it easy to use without making bad commits else its REALLY easy to mess up.

git add
git commit -m 'add proxy config'

I just don't see the features as a separate thing. In my opinion floppy/_packer_config*.cmd not being in the packer templates is an oversight that should have always been there.

Maybe DISABLE_BITS should be remove from floppy/_packer_config.cmd but I can see it becoming a default setting where proxy will never become a default setting. Which is why I put it in that file and suggest proxy config go in a user supplied ignored file.

arizvisa · 2020-03-02T22:05:17Z

Ok. No worries then. I'll do it for you.

daxgames · 2020-03-02T22:15:09Z

@arizvisa You'll leave it in or take it out? I am not trying to be difficult, just curious.

I mean, I am just pleading my case and trying to convince you. You are the maintainer and have the ultimate say. I just disagree it is a mixed feature PR because the scripts have always had the ability to run multiple floppy/_packer_config*.cmd scripts.

I can make it a separate PR if that is what you really want. Just let me know.

Added support for specifying additional floppy/_packer_config*.cmd files as part of PR #229.

arizvisa · 2020-03-10T17:33:42Z

Can you re-base this? The differences should be a lot smaller as a result of PR #235.

daxgames · 2020-03-15T00:25:53Z

@arizvisa Rebased

arizvisa

Good work on consolidating all the logic through _download.cmd. As mentioned in my review, I think if you're going to remove the else-case you might as well remove the entire conditional.

However, if you prefer to keep it, then at least let the user know that the download is actually being skipped due to the missing download script.

arizvisa · 2020-03-17T18:21:02Z

.gitignore

@@ -18,4 +18,3 @@ floppy/_packer_config_*.cmd
 *.*.json
 floppy/*.*.*
 script/*.*.*
-


This stray new-line is unnecessary.

arizvisa · 2020-03-17T18:21:38Z

README.md

@@ -1,3 +1,4 @@
+


This newline is also unnecessary.

arizvisa · 2020-03-17T18:23:40Z

floppy/_download.cmd

@@ -31,8 +31,8 @@ echo ==^> Copying "%found%" to "%filename%", skipping download.
 copy /y "%found%" "%filename%" && goto exit0

 :download
-
-echo ==^> Downloading "%url%" to "%filename%"
+REM IT IS JUST CLEANER WITH THIS WGET IS REALLY PICKY. POWERSHELL - NOT SO MUCH


No need to justify this with a comment.. Can be removed as well.

arizvisa · 2020-03-17T18:25:09Z

floppy/_download.cmd


-set filename=%~2
+set "filename=%~2"


Thanks for properly quoting these. It's good style.

arizvisa · 2020-03-17T18:30:54Z

floppy/bitvisessh.bat

@@ -17,9 +17,6 @@ pushd "%BITVISE_DIR%"

 if exist "%SystemRoot%\_download.cmd" (
 call "%SystemRoot%\_download.cmd" "%BITVISE_URL%" "%BITVISE_PATH%"
-) else (


These conditionals are used to detect if there's some kind of issue with the existence of the download script. If you're going to remove the "else" case, you might as well remove the whole conditional.

Ideally, though, you could emit an error and terminate the script if the download.cmd script is not found. However, either way is fine.

arizvisa · 2020-03-17T18:35:42Z

script/cmtool.bat

@@ -259,8 +253,9 @@ set SALT_URL=http://raw.githubusercontent.com/saltstack/salt-bootstrap/%SALT_REV
 set SALT_PATH=%SALT_DIR%\bootstrap-salt.ps1
 set SALT_DOWNLOAD=%SALT_DIR%\bootstrap-salt.download.ps1

-echo ==^> Downloading %SALT_URL% to %SALT_DOWNLOAD%
-powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_DOWNLOAD%')" <NUL
+if exist "%SystemRoot%\_download.cmd" (


(See prior comment)

arizvisa · 2020-03-17T18:35:55Z

script/cmtool.bat

@@ -301,7 +296,7 @@ if "%CM_VERSION%" == "latest" (
 set SALT_PATH=%SALT_DIR%\Salt-Minion-Setup.exe

 echo ==^> Downloading %SALT_URL% to %SALT_PATH%
-powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" <NUL
+call "%SystemRoot%\_download.cmd" %SALT_URL% %SALT_PATH%


(See prior comment)

arizvisa · 2020-03-17T18:36:11Z

script/ultradefrag.bat

@@ -53,9 +53,6 @@ cd /d "%SEVENZIP_DIR%"

 if exist "%SystemRoot%\_download.cmd" (
 call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%"
-) else (


(See comment for floppy/bitvisessh.bat)

arizvisa · 2020-03-17T18:36:25Z

script/ultradefrag.bat

@@ -131,9 +128,6 @@ pushd "%ULTRADEFRAG_DIR%"

 if exist "%SystemRoot%\_download.cmd" (
 call "%SystemRoot%\_download.cmd" "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%"
-) else (


(See comment for floppy/bitvisessh.bat)

arizvisa · 2020-03-17T18:36:48Z

script/vagrant.bat

@@ -15,9 +15,6 @@ pushd "%VAGRANT_DIR%"

 if exist "%SystemRoot%\_download.cmd" (
 call "%SystemRoot%\_download.cmd" "%VAGRANT_PUB_URL%" "%VAGRANT_PATH%"
-) else (


(See comment for floppy/bitvisessh.bat)

daxgames mentioned this pull request Feb 25, 2020

Add Cloud Init installer script #83

Open

daxgames changed the title ~~Proxy~~ Proxy support for Initial install and shell provisioners Feb 26, 2020

daxgames mentioned this pull request Feb 26, 2020

Prefix and proxy #179

Closed

arizvisa self-assigned this Feb 28, 2020

arizvisa added the enhancement This will introduce or improve an already existing capability label Feb 28, 2020

arizvisa self-requested a review February 28, 2020 22:38

arizvisa removed their request for review February 29, 2020 23:50

arizvisa mentioned this pull request Mar 2, 2020

Add support for specifying additional floppy/_packer_config*.cmd files #235

Merged

arizvisa added a commit that referenced this pull request Mar 6, 2020

Merge pull request #235 from arizvisa/GH-229-split

3d93aa8

Added support for specifying additional floppy/_packer_config*.cmd files as part of PR #229.

Dax T. Games added 9 commits March 14, 2020 20:15

incorporate powershell download with proxy into _download.cmd

d2763ab

add proxy env vars to provisioners

0920e78

add proxy env vars to provisioners

ef7568f

add proxy env vars to variables

f83ac26

add proxy env vars to variables

bb1dffa

add proxy env vars to variables

67c5e39

add proxy env vars to variables

127035e

add proxy env vars to variables

fa1181a

add authenticated proxy for wget downloads

7a0a8db

Dax T. Games added 3 commits March 14, 2020 20:22

add authenticated proxy for wget downloads

28eb81e

add authenticated proxy for wget downloads

c0565af

sync

d1ce776

daxgames force-pushed the proxy branch from f78d166 to d1ce776 Compare March 15, 2020 00:24

fix spelling

430386a

arizvisa suggested changes Mar 17, 2020

View reviewed changes

arizvisa force-pushed the master branch 2 times, most recently from 8d4907d to c7296dc Compare June 12, 2020 03:10

arizvisa mentioned this pull request Jul 19, 2020

Not using Makefile causes errors due to incorrectly formatted shutdown comment string and other things #255

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Proxy support for Initial install and shell provisioners #229

Proxy support for Initial install and shell provisioners #229

daxgames commented Feb 24, 2020 •

edited

Loading

daxgames commented Feb 24, 2020 •

edited

Loading

daxgames commented Feb 25, 2020

daxgames commented Feb 25, 2020

arizvisa commented Feb 28, 2020

daxgames commented Feb 29, 2020

arizvisa commented Feb 29, 2020

daxgames commented Mar 1, 2020 •

edited

Loading

arizvisa commented Mar 2, 2020

daxgames commented Mar 2, 2020

arizvisa commented Mar 2, 2020

daxgames commented Mar 2, 2020

arizvisa commented Mar 10, 2020

daxgames commented Mar 15, 2020

arizvisa left a comment

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

arizvisa Mar 17, 2020

Proxy support for Initial install and shell provisioners #229

Are you sure you want to change the base?

Proxy support for Initial install and shell provisioners #229

Conversation

daxgames commented Feb 24, 2020 • edited Loading

The first 4 PRs do everything that was in #179

This is new based on issues encountered with New Packer 1.5.2

Proxy support for Initial install and shell provisioners

daxgames commented Feb 24, 2020 • edited Loading

daxgames commented Feb 25, 2020

daxgames commented Feb 25, 2020

arizvisa commented Feb 28, 2020

daxgames commented Feb 29, 2020

arizvisa commented Feb 29, 2020

daxgames commented Mar 1, 2020 • edited Loading

arizvisa commented Mar 2, 2020

daxgames commented Mar 2, 2020

arizvisa commented Mar 2, 2020

daxgames commented Mar 2, 2020

arizvisa commented Mar 10, 2020

daxgames commented Mar 15, 2020

arizvisa left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daxgames commented Feb 24, 2020 •

edited

Loading

daxgames commented Feb 24, 2020 •

edited

Loading

daxgames commented Mar 1, 2020 •

edited

Loading