upgrade ocid 15.8 with automate

Signed-off-by: progress <[email protected]>

components/automate-cs-ocid/habitat/config/tasks/oauth_application.rake

@@ -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

components/automate-cs-ocid/habitat/plan.sh

@@ -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")
@@ -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=(
@@ -38,27 +38,27 @@ 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
+# do_prepare() {
+#   GO_LDFLAGS="-X main.RubyPath=$(hab pkg path 'core/ruby30')"
+#   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
-}
+#   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
+   # 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
 }