Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading to ocid 15.8.0 in Automate #8248

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Upgrading to ocid 15.8.0 in Automate #8248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52dac86
upgrade ocid 15.8 with automate
RoyShravani Oct 9, 2023
5fbafa7
cleanup
RoyShravani Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/automate-cs-ocid/habitat/config/tasks/oauth_application.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace :oauth_application do

desc "Task to generate a file with the details of all the registered oauth application under OC-ID"
task :save_registered_app_details_to_file => :environment do
registered_apps = Doorkeeper::Application.select(:name, :redirect_uri, :uid, :secret).group_by(&:name).as_json
registered_apps = Doorkeeper::Application.select(:name, :redirect_uri, :uid, :secret).map(&:attributes).group_by{|app| app["name"]}
yaml_file_content = registered_apps.to_yaml
file_path = ENV['REGISTERED_OAUTH_APPS_FILE_PATH']
begin
Expand Down
21 changes: 2 additions & 19 deletions components/automate-cs-ocid/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pkg_name="automate-cs-ocid"
pkg_description="Wrapper package for chef/ocid"
pkg_origin="chef"
# WARNING: Version managed by .expeditor/update_chef_server.sh
pkg_version="15.4.0"
pkg_version="15.8.0"
vendor_origin="chef"
pkg_maintainer="Chef Software Inc. <[email protected]>"
pkg_license=("Chef-MLSA")
Expand All @@ -21,7 +21,7 @@ pkg_deps=(
chef/mlsa
"${local_platform_tools_origin:-chef}/automate-platform-tools"
# WARNING: Version pin managed by .expeditor/update_chef_server.sh
"${vendor_origin}/oc_id/15.4.0/20230105061030"
"${vendor_origin}/oc_id/15.8.0/20230929110850"
)

pkg_binds=(
Expand All @@ -38,28 +38,11 @@ pkg_exposes=(http-port)
pkg_scaffolding="${local_scaffolding_origin:-chef}/automate-scaffolding"
automate_scaffolding_include_templates=(sqerl.config)

do_prepare() {
GO_LDFLAGS="-X main.RubyPath=$(hab pkg path 'core/ruby27')"
export GO_LDFLAGS

build_line "Setting link for /usr/bin/env to 'coreutils'"
[[ ! -f /usr/bin/env ]] && ln -s "$(pkg_path_for coreutils)/bin/env" /usr/bin/env
return 0
}

do_download() {
return 0
}

do_build() {
# TODO :: Remove following section once new ocid hab package is used which includes gem: "tzinfo-data"
cd $(pkg_path_for "chef/oc_id")/oc_id
bundle config path "vendor/bundle"
if ! grep -q "gem 'tzinfo-data'" Gemfile; then
echo "gem 'tzinfo-data'" >> Gemfile
bundle install
fi

return 0
}

Expand Down
Loading