Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Make generate repo default to policyfiles + cleanup generated readme content #2050

Merged
merged 23 commits into from
May 9, 2019
Merged

Make generate repo default to policyfiles + cleanup generated readme content #2050

merged 23 commits into from
May 9, 2019

Conversation

tas50
Copy link
Contributor

@tas50 tas50 commented May 5, 2019 •
edited
Loading

When someone is creating their new chef repo from scratch set it up with policyfiles
Update kitchen.yml to describe the modern way of specifying product_version
Make metadata.rb require Chef 14+
Improve readme text in various generated readme files
Improve help descriptions of the depsolvers
Remove the frozen_string_literal: true comments in the generated code
Chef / Chef Server -> Che Infra Client / Chef Infra Server
Remove references to the old wiki site
Generate a working dokken config
Generate cookbooks that require Che 14+ not Chef 13+
Set the commented out product_version in the kitchen configs to Chef 15 not 14
Generate modern ChefSpecs with platform versions that won't need to be updated every year

@tas50 tas50 force-pushed the generator_cleanup branch 6 times, most recently from 0574e73 to 10eadcf Compare May 7, 2019 07:18
@tas50 tas50 changed the title WIP: Further cleanup of the generated Chef data Make generate repo default to policyfiles + cleanup generated readme content May 7, 2019
@tas50 tas50 force-pushed the generator_cleanup branch 4 times, most recently from 4bcf0c5 to 431fc29 Compare May 8, 2019 20:06
mjingle
mjingle reviewed May 9, 2019
View reviewed changes
lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb Outdated
# frozen_string_literal: true
# This is a Chef recipe file. It can be used to specify resources which will
# apply configuration to a server.
# This is a Chef Infra Clientt recipe file. It can be used to specify resources
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# This is a Chef Infra Clientt recipe file. It can be used to specify resources
# This is a Chef Infra Client recipe file. It can be used to specify resources

@tyler-ball
Copy link
Contributor

Can you update the top level RELEASE_NOTES.md with these changes so we don't have to do that later?

tyler-ball
tyler-ball approved these changes May 9, 2019
View reviewed changes
Copy link
Contributor

@tyler-ball tyler-ball left a comment

Choose a reason for hiding this comment

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

👍 after getting release notes updated

mjingle
mjingle reviewed May 9, 2019
View reviewed changes
spec/unit/command/generator_commands/repo_spec.rb Outdated
@@ -327,11 +327,11 @@ def generator_context
<<~README
Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.

For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Infra Server:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Infra Server:
For example, in this directory, you'll find an example role file called `example.json`, which can be uploaded to the Chef Infra Server:

tas50 added 2 commits May 9, 2019 11:14
@tas50
Fix capitalization of InSpec in more places
3610bfa 
We missed a few

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Make chef generate repo XYZ use policyfiles by default now
c247add 
Match our current best practices

Signed-off-by: Tim Smith <tsmith@chef.io>
tas50 added 20 commits May 9, 2019 11:14
@tas50
Remove string literal comments from ruby code
ef56c7b 
Rubocop doesn't recommend this now. The string literals can has been kicked down the road a bit further.

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Improve readme and help information
0bd19b0 
Remove references to the wiki and a nonsense statement about tarballs.

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Update the gitignore for non-hidden kitchen files
9df17a8 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Move templates out of the default directory
f749570 
This is a Chef 11-ism that we don't need to do anymore

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Use the new kitchen config for specifying a Chef Version
f0d44ac 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Update link to InSpec docs
d8f4bf5 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Add the product_name / product_version example to both kitchen configs
2cb8acc 
This should be here as well

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Remove more string literal comments and fix some specs
fc12b36 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Avoid a few Foodcritic warnings in the code generator
7a1ac96 
These don't matter the way we're using this

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Improve the cookbook creation text
f7773ec 
Never miss an opportunity to drop a brand name.

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Stick the templates back in default
f90b642 
Work around foodcritic issues

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Chef Platform -> Hosted Chef
10bfaa8 
This made no sense

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
More Chef -> Chef Infra Client
1facef6 
I'll have it all soon

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Add proper space after comments to build cookbook
9b5f583 
Savages

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Fix comments in the gitignore file
de03b5f 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Require Chef 14 in cookbooks and update Kitchen config to 15
9837c62 
These are sane defaults for DK 4 / Chef 15 land

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Make the example dokken config a working example
341cd7e 
Without the pid_one_command bit it won't work

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Auto generate modern ChefSpecs
4aa7e11 
Get people using the new format with major versions only so eventually we can stop generating every point release in Fauxhai.

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Fix chefstyle
18d9f4a 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50
Updates from code review
85e15a6 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50 tas50 force-pushed the generator_cleanup branch from 5c492c6 to 85e15a6 Compare May 9, 2019 18:14
@tas50
Add Chef Generate changes to the release notes
929b611 
Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50 tas50 merged commit 53d72e4 into master May 9, 2019
@chef-ci chef-ci deleted the generator_cleanup branch May 9, 2019 18:26
@lock
Copy link

lock bot commented Jul 9, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jul 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mjingle mjingle mjingle left review comments

@tyler-ball tyler-ball tyler-ball approved these changes

@lamont-granquist lamont-granquist lamont-granquist approved these changes

@btm btm Awaiting requested review from btm

@jonsmorrow jonsmorrow Awaiting requested review from jonsmorrow

@robbkidd robbkidd Awaiting requested review from robbkidd

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tas50 @tyler-ball @lamont-granquist @mjingle