Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json #3101

aleksey-hariton · 2022-01-20T12:53:38Z

Replacing Chef trademarks where possible.
Related PR`s:

Description

This changes required to make open-sourcing of ChefServer possible (Cinc project).

…ver.rb

netlify · 2022-01-20T12:53:43Z

👷 Deploy Preview for chef-server processing.

🔨 Explore the source changes: 61f45d2

🔍 Inspect the deploy log: https://app.netlify.com/sites/chef-server/deploys/6216708bbc52e800081668a0

marcparadise · 2022-01-24T14:14:34Z

omnibus/files/server-ctl-cookbooks/infra-server/attributes/default.rb

@@ -78,11 +81,11 @@
 # The Chef User that services run as
 ####
 # The username for the chef services user
-default['private_chef']['user']['username'] = 'opscode'
+default['private_chef']['user']['username'] = ChefUtils::Dist::Org::LEGACY_CONF_DIR


this is a username, but we're using a dirname const. If we want to change the default username, this should have its own const.

@marcparadise Would you like us to add something like ChefUtils::Dist::Server::USERNAME to chef-utils?

@marcparadise if this works for you - https://github.com/chef/chef/pull/12513/files

lbakerchef · 2022-01-25T02:40:04Z

At a minimum I think we need to see that the output (it can be snipped) of chef-server-ctl test or even chef-server-ctl test --all is successful. [NOTE: I tried to run an adhoc and planned to run umbrella after, but these apparently don't play nice with forks]

ramereth

This matches what we have on the Cinc side FWIW ...

ramereth · 2022-01-26T01:20:21Z

omnibus/files/server-ctl-cookbooks/infra-server/templates/default/pivotal.rb.erb

@@ -1,7 +1,7 @@
 require "tempfile"
 require "veil"

-secrets_file = ENV['SECRETS_FILE'] || "/etc/opscode/private-chef-secrets.json"
+secrets_file = ENV['SECRETS_FILE'] || "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"


Suggested change

secrets_file = ENV['SECRETS_FILE'] || "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"

secrets_file = ENV['SECRETS_FILE'] || "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-#{ChefUtils::Dist::Infra::SHORT}-secrets.json"

ramereth · 2022-01-26T01:20:41Z

omnibus/files/server-ctl-cookbooks/infra-server/libraries/private_chef.rb

@@ -334,7 +334,7 @@ def gen_api_fqdn

    # TODO: 2017-02-28 mp:  configurable location:
    def secrets_json
-      '/etc/opscode/private-chef-secrets.json'
+      "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"


Suggested change

"/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"

"/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-#{ChefUtils::Dist::Infra::SHORT}-secrets.json"

Signed-off-by: Aleksey Hariton <aleksey.hariton@gmail.com>

src/chef-server-ctl/lib/chef_server_ctl/config.rb

jashaik · 2022-02-23T07:23:06Z

Pipeline Information -
Adhoc - https://buildkite.com/chef/chef-chef-server-main-omnibus-adhoc/builds/3947
Pipeline status:
Reconfigure is failing with the below error. Needs to be fixed

I am going to test this manually in dev VM
`
Error:

opscode_erchef['keygen_start_size'] = 30
  | opscode_erchef['keygen_cache_size']=60
  | nginx['ssl_dhparam']='/etc/opscode/dhparam.pem'
  | insecure_addon_compat false
  | data_collector['token'] = 'foobar'
  | profiles['root_url'] = 'http://localhost:9998'
  | -----BEGIN DH PARAMETERS-----
  | MIIBCAKCAQEAtAvx3pUHBNcK2nD58nPPlKtJzZvrFCyKEn9BSn16/BmFwBhL8rh4
  | +fkrnLflZ/k9wJjiUkU0DCi+Fy6DUohPHOmmT0BiuwgsDZAFDyTj0PeZKINpbHnQ
  | EbZENzWo5s5hsb1zVxIMEtTMRrigdHM3FQupFbzOHxonkO0JlocarOJBHGX+Crjp
  | y/8SReCpC71R+Vl6d4+Dw6GFdL+6k6W558dPfq3UeV8HPWQEaM7/jXDUKJZ0tB6a
  | 1csrekkz3gBFlSjSxececRVn8bm5dTfc86rIWJWeWQVLYdBFT6zi43AvF+nLYKYh
  | +oVnVrhWgOLYvEKX311d9SaqcdrXVFscYwIBAg==
  | -----END DH PARAMETERS-----
  | Traceback (most recent call last):
  | 7: from /usr/bin/chef-server-ctl:174:in `<main>'
  | 6: from /usr/bin/chef-server-ctl:174:in `load'
  | 5: from /opt/opscode/embedded/lib/ruby/gems/2.7.0/gems/chef-server-ctl-1.1.0/bin/chef-server-ctl:7:in `<top (required)>'
  | 4: from /opt/opscode/embedded/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:83:in `require'
  | 3: from /opt/opscode/embedded/lib/ruby/2.7.0/rubygems/core_ext/kernel_require.rb:83:in `require'
  | 2: from /opt/opscode/embedded/lib/ruby/gems/2.7.0/gems/chef-server-ctl-1.1.0/lib/chef_server_ctl/config.rb:19:in `<top (required)>'
  | 1: from /opt/opscode/embedded/lib/ruby/gems/2.7.0/gems/chef-server-ctl-1.1.0/lib/chef_server_ctl/config.rb:20:in <module:ChefServerCtl>'
  | /opt/opscode/embedded/lib/ruby/gems/2.7.0/gems/chef-server-ctl-1.1.0/lib/chef_server_ctl/config.rb:28:in <module:Config>': uninitialized constant ChefUtils::Dist::Server::SERVER_DOCS (NameError)
  | 🚨 Error: The command exited with status 1

marcparadise · 2022-02-24T14:29:11Z

Maybe that failure will be fixed if we update the Chef gem? The const is present:

https://github.com/chef/chef/blob/main/chef-utils/lib/chef-utils/dist.rb#L115

ramereth · 2022-02-24T18:39:47Z

Maybe that failure will be fixed if we update the Chef gem? The const is present:

https://github.com/chef/chef/blob/main/chef-utils/lib/chef-utils/dist.rb#L115

Yes, should we go ahead and bump it in this PR or do it in a different PR? The latest 16 release should include the constant (v16.17.51)

ramereth · 2022-02-24T21:30:22Z

@aleksey-hariton @lbakerchef @marcparadise @jashaik I have created #3205 to replace this PR which should have the final fixes (hopefully). This is created from our shared repo which will make it easier for our group to push any additional fixes to.

aleksey-hariton · 2022-02-25T12:14:54Z

Closing in favor to #3205

feat: replace opscode from folder names, remove hardcodes of chef-ser…

155f3e9

…ver.rb

aleksey-hariton requested review from a team as code owners January 20, 2022 12:53

marcparadise reviewed Jan 24, 2022

View reviewed changes

feat: replace opscode in folder names

abe3ddc

feat: replace "Chef Infra Server" with constant, where possible

0b68a14

aleksey-hariton force-pushed the main branch from 649fe08 to 0b68a14 Compare January 25, 2022 15:37

ramereth reviewed Jan 26, 2022

View reviewed changes

This was referenced Jan 26, 2022

Replace trademarks hardcodes with constants chef/chef_backup#42

Merged

Add constant for ChefServer system user chef/chef#12513

Merged

Add constant for ChefServer system user chef/chef#12519

Merged

Add constant for ChefServer system user chef/chef#12520

Merged

feat: fix secrets and server-running file names

c97e95e

aleksey-hariton force-pushed the main branch from 4971d22 to c97e95e Compare January 31, 2022 07:50

chore: replacec servers docs and patents URLs

ec5fe13

Signed-off-by: Aleksey Hariton <aleksey.hariton@gmail.com>

This was referenced Jan 31, 2022

Chef 18 - Added constant with Server`s docs url chef/chef#12539

Merged

Chef 17 - Add constant for ChefServer`s docs url chef/chef#12540

Merged

Chef 16 - Add constant for ChefServer`s docs url chef/chef#12541

Merged

aleksey-hariton force-pushed the main branch from 345fe13 to ec5fe13 Compare January 31, 2022 15:09

aleksey-hariton mentioned this pull request Feb 1, 2022

Replace hardcode of server status json chef/omnibus-ctl#83

Merged

aleksey-hariton added 5 commits February 4, 2022 15:40

fix: fix secrets file name

fc63cfb

chore: remove opscode in _status test

9ecfbf0

fix: proper secrets file name

31650ed

fix: add opscode constant for tests

5d810f7

fix: typo

ab102fd

ramereth reviewed Feb 18, 2022

View reviewed changes

src/chef-server-ctl/lib/chef_server_ctl/config.rb Outdated Show resolved Hide resolved

aleksey-hariton changed the title ~~WIP: replace opscode from folder names, remove hardcodes of chef-server.rb~~ Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json Feb 22, 2022

Merge branch 'main' into main

61f45d2

ramereth mentioned this pull request Feb 24, 2022

Opscode Wordmark replacements #3205

Closed

5 tasks

aleksey-hariton closed this Feb 25, 2022

lbakerchef mentioned this pull request Mar 21, 2022

Opscode wordmark replacements #3238

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json #3101

Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json #3101

aleksey-hariton commented Jan 20, 2022 •

edited

netlify bot commented Jan 20, 2022 •

edited

marcparadise Jan 24, 2022

ramereth Jan 24, 2022

aleksey-hariton Jan 26, 2022

lbakerchef commented Jan 25, 2022

ramereth left a comment

ramereth Jan 26, 2022

ramereth Jan 26, 2022

jashaik commented Feb 23, 2022 •

edited by marcparadise

marcparadise commented Feb 24, 2022

ramereth commented Feb 24, 2022

ramereth commented Feb 24, 2022

aleksey-hariton commented Feb 25, 2022

	secrets_file = ENV['SECRETS_FILE'] \|\| "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"
	secrets_file = ENV['SECRETS_FILE'] \|\| "/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-#{ChefUtils::Dist::Infra::SHORT}-secrets.json"

	"/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-chef-secrets.json"
	"/etc/#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}/private-#{ChefUtils::Dist::Infra::SHORT}-secrets.json"

Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json #3101

Replace opscode from folder names, hardcodes of chef-server.rb, chef-server-running.json, chef-secrets.json #3101

Conversation

aleksey-hariton commented Jan 20, 2022 • edited

Description

netlify bot commented Jan 20, 2022 • edited

marcparadise Jan 24, 2022

Choose a reason for hiding this comment

ramereth Jan 24, 2022

Choose a reason for hiding this comment

aleksey-hariton Jan 26, 2022

Choose a reason for hiding this comment

lbakerchef commented Jan 25, 2022

ramereth left a comment

Choose a reason for hiding this comment

ramereth Jan 26, 2022

Choose a reason for hiding this comment

ramereth Jan 26, 2022

Choose a reason for hiding this comment

jashaik commented Feb 23, 2022 • edited by marcparadise

marcparadise commented Feb 24, 2022

ramereth commented Feb 24, 2022

ramereth commented Feb 24, 2022

aleksey-hariton commented Feb 25, 2022

aleksey-hariton commented Jan 20, 2022 •

edited

netlify bot commented Jan 20, 2022 •

edited

jashaik commented Feb 23, 2022 •

edited by marcparadise