`HTTPConfig` : Add http_content to be served #43

azr · 2021-03-19T16:18:07Z

This will allow to

feature
docs
tests ; I also added some tests for the http config struct.

be clearer in comments

some cleanup

…before returning In unit tests we would get before the server was up, causing failures

sylviamoss

Is this done? I made you some questions.
I haven't tested but the code looks good so far.

sylviamoss · 2021-03-22T07:39:25Z

multistep/commonsteps/http_config.go

+	// `boot_command`. This is covered in more detail below. Example: Setting
+	// `"foo/bar"="baz", will allow you to http get on
+	// `http://{http_ip}:{http_port}/foo/bar`.
+	HTTPContent map[string]string `mapstructure:"http_content"`


This is not a backward incompatibility but it is something that will require all builder components using http_config to update their hcl2spec files in order to be compatible with this feature.
If I'm right, I have two questions:

Are you planning to write a blog post for this?

Should this be officially released on 1.8.0?

Good questions!

Should this be officially released on 1.8.0?

The earlier we merge this one, the less manual updates we will have to do in plugins in order to support this. So my guess would be to merge this one now-ish.

Are you planning to write a blog post for this?

🤔 I wasn't planning on doing that ! But you are right !
This definitely could use a new guide or help section too.

Nice! We just need to remember to run generate on Packer when this one is merged. So that 1.7.1 will be compatible with these changes.

multistep/commonsteps/step_http_server.go

…eing up before returning" This reverts commit 3d20a49.

…venshtein.Distance

cosmetic changes

the levenshtein import is now direct

azr · 2021-03-22T14:01:23Z

multistep/commonsteps/step_http_server.go

+		if sug := didyoumean.NameSuggestion(path, paths); sug != "" {
+			err += fmt.Sprintf("Did you mean %q?", sug)
+		}


This makes lives easier <3 !

( even saved me a few times in tests mode already )

this is super cool :D

azr · 2021-03-22T14:02:30Z

This is ready for review 🙂

to avoid stutter

SwampDragons · 2021-03-22T19:40:45Z

I pulled this to try and test and I can't get it working; on at least on the QEMU builder it is trying to read from a port 0 which seems wrong. Can you give a more complete example?

multistep/commonsteps/http_config.go

SwampDragons · 2021-03-22T18:51:00Z

multistep/commonsteps/step_http_server.go

+		if sug := didyoumean.NameSuggestion(path, paths); sug != "" {
+			err += fmt.Sprintf("Did you mean %q?", sug)
+		}


this is super cool :D

SwampDragons · 2021-03-22T18:59:01Z

multistep/commonsteps/step_http_server.go

@@ -70,6 +126,8 @@ func (s *StepHTTPServer) Run(ctx context.Context, state multistep.StateBag) mult
 func (s *StepHTTPServer) Cleanup(multistep.StateBag) {
 	if s.l != nil {
 		// Close the listener so that the HTTP server stops
-		s.l.Close()
+		if err := s.l.Close(); err != nil {
+			log.Printf("Failed closing http server on port %d: %v", s.l.Port, err)


should this error print to the UI?

Good question, this error should be temporary and won't prevent Packer from working. We check if ports are already open for new calls to Listen. Finally, when Packer terminates: the connection will be auto closed on most systems. Though on some system it could take some time and cause a FS leak if it happened A LOT of times. Yup this should be at least be shown in the UI.

be clearer about the file function tip

remove unused //go:generate mapstructure-to-hcl2 -type TestHttpConfig

sylviamoss

LGTM!
Tested with virtualbox-iso building and alpine image and it worked good! 👍🏼

sylviamoss · 2021-03-23T09:49:56Z

didyoumean/name_suggestion.go

@@ -0,0 +1,24 @@
+package didyoumean


I like the package name!

This imports hashicorp/packer-plugin-sdk#43 * code generate things * update docs * update guides * update examples We want to add a new guide.

azr added 6 commits March 18, 2021 11:05

add HTTPContent map[string]string to serve

c11f1dd

http_content serve: print errors

db40699

Update step_http_server.go

63c43d5

be clearer in comments

Update HTTPConfig-not-required.mdx

987cca7

Update step_http_server.go

44894bc

some cleanup

add a bunch of tests

e82d5ba

azr added the enhancement New feature or request label Mar 19, 2021

azr requested a review from a team as a code owner March 19, 2021 16:18

azr marked this pull request as draft March 19, 2021 16:22

azr added 2 commits March 19, 2021 17:37

better docs

4020574

http server run: slightly augment the chances of the server being up …

3d20a49

…before returning In unit tests we would get before the server was up, causing failures

sylviamoss reviewed Mar 22, 2021

View reviewed changes

azr added 6 commits March 22, 2021 10:14

Revert "http server run: slightly augment the chances of the server b…

4952a68

…eing up before returning" This reverts commit 3d20a49.

add a "did you mean" package that helps get suggestions based on a le…

13abb7d

…venshtein.Distance

step_http_server.serve_content: clean paths to avoid surprises

83074fd

Update step_http_server.go

fe6a971

cosmetic changes

Update go.mod

845c14f

the levenshtein import is now direct

fix case typo for tests

6af63a9

azr marked this pull request as ready for review March 22, 2021 14:00

azr commented Mar 22, 2021

View reviewed changes

azr mentioned this pull request Mar 22, 2021

Add http_content func to serve variables from HTTP @ preseed hashicorp/packer#10801

Merged

4 tasks

StepHTTPServerFromHTTPConfig > HTTPServerFromHTTPConfig

2197883

to avoid stutter

SwampDragons reviewed Mar 22, 2021

View reviewed changes

azr and others added 5 commits March 23, 2021 10:11

Update multistep/commonsteps/http_config.go

e5e327b

be clearer about the file function tip

finish quoting example

a1fa039

Update step_http_server_test.go

ef19d83

remove unused //go:generate mapstructure-to-hcl2 -type TestHttpConfig

StepHTTPServer.Cleanup: Show on Ui if connection close failed

975e728

Put a space before the did you mean

a7673bc

sylviamoss approved these changes Mar 23, 2021

View reviewed changes

didyoumean/name_suggestion.go

@@ -0,0 +1,24 @@

package didyoumean

Copy link

Contributor

sylviamoss Mar 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the package name!

azr merged commit 5a7ab7f into main Mar 23, 2021

azr deleted the azr_http_serve_content branch March 23, 2021 11:17

This was referenced Mar 31, 2021

Update CHANGELOG #47

Merged

file templating for floppy/cd files hashicorp/packer#10859

Open

puetzk mentioned this pull request Aug 16, 2021

Templating for floppy_files and cd_files hashicorp/packer#11210

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`HTTPConfig` : Add http_content to be served #43

`HTTPConfig` : Add http_content to be served #43

azr commented Mar 19, 2021

sylviamoss left a comment

sylviamoss Mar 22, 2021

azr Mar 22, 2021

sylviamoss Mar 22, 2021

azr Mar 22, 2021

azr Mar 22, 2021

SwampDragons Mar 22, 2021

azr commented Mar 22, 2021

SwampDragons commented Mar 22, 2021

SwampDragons Mar 22, 2021

SwampDragons Mar 22, 2021

azr Mar 23, 2021

sylviamoss left a comment

sylviamoss Mar 23, 2021

HTTPConfig : Add http_content to be served #43

HTTPConfig : Add http_content to be served #43

Conversation

azr commented Mar 19, 2021

sylviamoss 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

azr commented Mar 22, 2021

SwampDragons commented Mar 22, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sylviamoss left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

`HTTPConfig` : Add http_content to be served #43

`HTTPConfig` : Add http_content to be served #43