fix broken devops/Makefile help generation expression

[acsr]

see Ticket #305

• I signed and returned the Plone Contributor Agreement, and received and accepted an invitation to join a team in the Plone GitHub organization.
• I verified there aren't any other open pull requests for the same change.
• I followed the guidelines in Contributing to Plone.
• I successfully ran code quality checks on my changes locally.
• I successfully ran tests on my changes locally.
• If needed, I added new tests for my changes.
• If needed, I added documentation for my changes.
• I included a change log entry in my commits.

Closes #305

[acsr]

I have overseen a flaw that the new expression does not include the resolution of the variable $(STACK_NAME) in the output:

make help

# partial output:
...
stack-deploy       Deploy stacks: $(STACK_NAME)
stack-create-site      Create a new site stacks: $(STACK_NAME)
...

I see that the flaw was present already before my suggested change.

I need to figure out how to make them work. Especially when the devops stuff is not fully generated from the .env file.

My opinion: Leaving in this new state is better than nothing and then make a next iteration.

[acsr]

I need to figure out how to make them work. Especially when the devops stuff is not fully generated from the .env file.

The issue comes up because the expression filters the Makefile for the text behind double ## to catch the text for the output.

• The variable $(STACK_NAME) is not expanded in that context and just taken literal for the output.
• The help text plural "stacks" suggests this command deals with multiple different stacks. Not sure if this is true.[*]
• This can be replaced in the output with a more generic text like:

...
stack-deploy       Deploy stack: uses $(STACK_NAME) currently defined in your .env
stack-create-site      Create a new site stack: uses $(STACK_NAME) currently defined in your .env
...

It seems I cannot do that much more without diving too deep into Makefiles (for my scope).

[*] I personally use multiple stacks (two: one for the production server, one for a full featured staging server)

[davisagli]

The reason the existing command doesn't work is because MAKEFILE_LIST is equal to Makefile .env rather than just Makefile. grep is searching multiple files so it prepends the filename to the output.

I suggest a simpler fix (so it's more consistent with the other Makefile help commands): let's change the command to explicitly refer to Makefile instead of $(MAKEFILE_LIST)

[davisagli]

@acsr I did it my way in #317. Thanks for pointing out the problem and proposing a fix.

[acsr]

@acsr I did it my way in #317. Thanks for pointing out the problem and proposing a fix.

@davisagli Now it is all green ;-)