Merge branch 'main' into dependabot/bundler/src/oc-id/sinatra-3.0.4

chef · Dec 8, 2022 · a39e2c2 · a39e2c2
2 parents 497f9b8 + 31b6ec8
commit a39e2c2
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 80 deletions.
diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml
@@ -25,11 +25,11 @@ jobs:
     steps:
     # Checkout the repository to the GitHub Actions runner
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Customize the ruby version depending on your needs
     - name: Setup Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: '2.7'
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,19 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.3.13 -->
-## [15.3.13](https://github.com/chef/chef-server/tree/15.3.13) (2022-11-26)
+<!-- latest_release 15.3.16 -->
+## [15.3.16](https://github.com/chef/chef-server/tree/15.3.16) (2022-12-07)
 
 #### Merged Pull Requests
-- Bump pg from 1.4.4 to 1.4.5 in /src/oc-id [#3520](https://github.com/chef/chef-server/pull/3520) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Upgrade most bookshelf, bifrost, and oc_erchef Erlang dependencies. [#3537](https://github.com/chef/chef-server/pull/3537) ([lbakerchef](https://github.com/lbakerchef))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.3.2 -->
 ### Changes since 15.3.2 release
 
 #### Merged Pull Requests
+- Upgrade most bookshelf, bifrost, and oc_erchef Erlang dependencies. [#3537](https://github.com/chef/chef-server/pull/3537) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.3.16 -->
+- Update ruby-setup to the actively maintained codebase. Update actions to v3 [#3539](https://github.com/chef/chef-server/pull/3539) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit)) <!-- 15.3.15 -->
+- Bump pg from 1.4.4 to 1.4.5 in /src/chef-server-ctl [#3518](https://github.com/chef/chef-server/pull/3518) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.3.14 -->
 - Bump pg from 1.4.4 to 1.4.5 in /src/oc-id [#3520](https://github.com/chef/chef-server/pull/3520) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.3.13 -->
 - Fix chef_authn reference [#3523](https://github.com/chef/chef-server/pull/3523) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.3.12 -->
 - Fix Makefile for bumping Erlang deps [#3503](https://github.com/chef/chef-server/pull/3503) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.3.11 -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-15.3.13
+15.3.16
diff --git a/src/bookshelf/rebar.lock b/src/bookshelf/rebar.lock
@@ -1,5 +1,7 @@
-{"1.2.0",
-[{<<"base16">>,{pkg,<<"base16">>,<<"1.0.0">>},1},
+[{<<"base16">>,
+  {git,"https://github.com/goj/base16",
+       {ref,"f78918e7b593fbdc35ec9bcc349aa50f47f45a8b"}},
+  1},
  {<<"cf">>,
   {git,"https://github.com/project-fifo/cf",
        {ref,"2bcf00402db9ca5a4790de7f82c8139baaf8856c"}},
@@ -8,7 +10,10 @@
   {git,"https://github.com/chef/chef_secrets",
        {ref,"6fa36689fd599602e5985587a1497282df2d907a"}},
   0},
- {<<"eini">>,{pkg,<<"eini">>,<<"1.2.6">>},1},
+ {<<"eini">>,
+  {git,"https://github.com/erlcloud/eini",
+       {ref,"511a94254d6eecc9331da31cd4fa08ff64b4d2e2"}},
+  1},
  {<<"ej">>,
   {git,"https://github.com/chef/ej",
        {ref,"f843f4da1cb7d8d2414adccc37fe523e3f92d789"}},
@@ -22,12 +27,12 @@
        {ref,"17b0f97ea8287b72e8ebbe7132214db182ff1a1d"}},
   0},
  {<<"epgsql">>,
-  {git,"https://github.com/chef/epgsql-1",
+  {git,"https://github.com/chef/epgsql-1.git",
        {ref,"34b4182f0e21f9189ddd7b2e290f01a9e7d93bf1"}},
   1},
  {<<"erlcloud">>,
   {git,"https://github.com/chef/erlcloud",
-       {branch,"lbaker/presigned-headers"}},
+       {ref,"52ff8e7a0361a206bb0efb56453e9f1cffd142fb"}},
   0},
  {<<"erlsom">>,
   {git,"https://github.com/chef/erlsom",
@@ -37,25 +42,37 @@
   {git,"https://github.com/chef/erlware_commons",
        {ref,"f511ed875bea87212ba9ee40ade1c9f53498ce79"}},
   0},
- {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
+ {<<"fs">>,
+  {git,"https://github.com/synrc/fs",
+       {ref,"936ba9dcf88186250ecc5995e25154bde44252a1"}},
+  1},
+ {<<"goldrush">>,
+  {git,"https://github.com/DeadZen/goldrush",
+       {ref,"8f1b715d36b650ec1e1f5612c00e28af6ab0de82"}},
+  1},
  {<<"iso8601">>,
   {git,"https://github.com/erlsci/iso8601",
        {ref,"4603fc810cacf859761c0e154590cde2ce9cc6b5"}},
   0},
  {<<"jiffy">>,
   {git,"https://github.com/davisp/jiffy",
-       {ref, "9ea1b35b6e60ba21dfd4adbd18e7916a831fd7d4"}},
+       {ref,"9ea1b35b6e60ba21dfd4adbd18e7916a831fd7d4"}},
+  1},
+ {<<"jsx">>,
+  {git,"https://github.com/talentdeficit/jsx",
+       {ref,"e8d2e01b608e0670a4f82e35ccb5ef3f86115423"}},
   1},
- {<<"jsx">>,{pkg,<<"jsx">>,<<"2.9.0">>},1},
  {<<"lager">>,
   {git,"https://github.com/erlang-lager/lager",
        {ref,"a140ea935eae9149bb35234bb40f6acf1c69caa1"}},
   0},
- {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.6.2">>},1},
+ {<<"lhttpc">>,
+  {git,"https://github.com/erlcloud/lhttpc",
+       {ref,"8e34985a3cd0ac2a7fc2a88a041554c64d33e74b"}},
+  1},
  {<<"meck">>,
   {git,"https://github.com/eproxus/meck",
-       {ref,"06192a984750070ace33b60a492ca27ec9bc6806"}},
+       {ref,"86cee221a7821fcf15e757b9aa17e81f68b07399"}},
   0},
  {<<"mini_s3">>,
   {git,"https://github.com/chef/mini_s3",
@@ -67,7 +84,7 @@
   0},
  {<<"mochiweb">>,
   {git,"https://github.com/mochi/mochiweb",
-       {ref,"070594e4d66163d662ac7e3bfb75dadcc922dd7c"}},
+       {ref,"7c4d3110b1889a5d58eb4dda2b1ddbb5645df3e9"}},
   0},
  {<<"observer_cli">>,
   {git,"https://github.com/zhongwencool/observer_cli",
@@ -78,13 +95,16 @@
        {ref,"5436cc600db462226a5d2f3ed585ab39eaf20ee5"}},
   0},
  {<<"pooler">>,
-  {git,"https://github.com/chef/pooler",
+  {git,"https://github.com/chef/pooler.git",
        {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
   1},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.1">>},1},
+ {<<"recon">>,
+  {git,"https://github.com/ferd/recon/",
+       {ref,"f7b6c08e6e9e2219db58bfb012c58c178822e01e"}},
+  1},
  {<<"sqerl">>,
   {git,"https://github.com/chef/sqerl",
-       {ref,"a27e3e58da53240dc9925ec03ecdb894b8231cf9"}},
+       {ref,"ebbe4c20ab5cd21041229d22dd60a6b38aa2930c"}},
   0},
  {<<"sync">>,
   {git,"https://github.com/rustyio/sync",
@@ -93,14 +113,4 @@
  {<<"webmachine">>,
   {git,"https://github.com/chef/webmachine",
        {ref,"1389b01a9fbc25d36aad8956e08d2d0db242625f"}},
-  1}]}.
-[
-{pkg_hash,[
- {<<"base16">>, <<"283644E2B21BD5915ACB7178BED7851FB07C6E5749B8FAD68A53C501092176D9">>},
- {<<"eini">>, <<"DFFA48476FD89FB6E41CEEA0ADFA1BC6E7862CCD6584417442F8BB37E5D34715">>},
- {<<"fs">>, <<"9D147B944D60CFA48A349F12D06C8EE71128F610C90870BDF9A6773206452ED0">>},
- {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"jsx">>, <<"D2F6E5F069C00266CAD52FB15D87C428579EA4D7D73A33669E12679E203329DD">>},
- {<<"lhttpc">>, <<"044F16F0018C7AA7E945E9E9406C7F6035E0B8BC08BF77B00C78CE260E1071E3">>},
- {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>}]}
-].
+  1}].
diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock
@@ -288,7 +288,7 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     pbkdf2 (0.1.0)
-    pg (1.4.4)
+    pg (1.4.5)
     plist (3.6.0)
     proxifier (1.0.3)
     pry (0.14.1)

diff --git a/src/oc_bifrost/rebar.lock b/src/oc_bifrost/rebar.lock
@@ -1,30 +1,35 @@
-{"1.1.0",
 [{<<"chef_secrets">>,
   {git,"https://github.com/chef/chef_secrets",
        {ref,"6fa36689fd599602e5985587a1497282df2d907a"}},
   0},
  {<<"edown">>,
   {git,"https://github.com/uwiger/edown",
-       {ref,"3c4f660c892e395fedac83b43476b23d38f4efb4"}},
+       {ref,"36b838a7fdf829cb5dac07533294f7cb8c8de632"}},
   0},
  {<<"ej">>,
   {git,"https://github.com/chef/ej",
        {ref,"f843f4da1cb7d8d2414adccc37fe523e3f92d789"}},
   0},
  {<<"envy">>,
-  {git,"https://github.com/manderson26/envy",
+  {git,"https://github.com/manderson26/envy.git",
        {ref,"0148fb4b7ed0e188511578e98b42d6e7dde0ebd1"}},
   1},
  {<<"eper">>,
   {git,"https://github.com/massemanet/eper",
        {ref,"17b0f97ea8287b72e8ebbe7132214db182ff1a1d"}},
   0},
  {<<"epgsql">>,
-  {git,"https://github.com/chef/epgsql-1",
+  {git,"https://github.com/chef/epgsql-1.git",
        {ref,"34b4182f0e21f9189ddd7b2e290f01a9e7d93bf1"}},
   1},
- {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1},
- {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
+ {<<"fs">>,
+  {git,"https://github.com/synrc/fs",
+       {ref,"936ba9dcf88186250ecc5995e25154bde44252a1"}},
+  1},
+ {<<"goldrush">>,
+  {git,"https://github.com/DeadZen/goldrush",
+       {ref,"8f1b715d36b650ec1e1f5612c00e28af6ab0de82"}},
+  1},
  {<<"jiffy">>,
   {git,"https://github.com/davisp/jiffy",
        {ref,"9ea1b35b6e60ba21dfd4adbd18e7916a831fd7d4"}},
@@ -43,7 +48,7 @@
   0},
  {<<"mochiweb">>,
   {git,"https://github.com/mochi/mochiweb",
-       {ref,"070594e4d66163d662ac7e3bfb75dadcc922dd7c"}},
+       {ref,"7c4d3110b1889a5d58eb4dda2b1ddbb5645df3e9"}},
   0},
  {<<"observer_cli">>,
   {git,"https://github.com/zhongwencool/observer_cli",
@@ -54,29 +59,26 @@
        {ref,"5436cc600db462226a5d2f3ed585ab39eaf20ee5"}},
   0},
  {<<"pooler">>,
-  {git,"https://github.com/chef/pooler",
+  {git,"https://github.com/chef/pooler.git",
        {ref,"681c355abaacc5487ddf41a84b9ed53151a765fe"}},
   1},
- {<<"recon">>,{pkg,<<"recon">>,<<"2.5.1">>},1},
+ {<<"recon">>,
+  {git,"https://github.com/ferd/recon/",
+       {ref,"f7b6c08e6e9e2219db58bfb012c58c178822e01e"}},
+  1},
  {<<"sqerl">>,
   {git,"https://github.com/chef/sqerl",
-       {ref,"a27e3e58da53240dc9925ec03ecdb894b8231cf9"}},
+       {ref,"ebbe4c20ab5cd21041229d22dd60a6b38aa2930c"}},
   0},
  {<<"stats_hero">>,
   {git,"https://github.com/chef/stats_hero",
        {ref,"4fbca5e2fcb4d464eab458025f7933f5c53f6330"}},
   0},
  {<<"sync">>,
   {git,"https://github.com/rustyio/sync",
-       {ref,"7c9367e73b7dbb01a788f8d0120d747330112f6f"}},
+       {ref,"3f0049e809ffe303ae2cd395217a025ce6e758ae"}},
   0},
  {<<"webmachine">>,
   {git,"https://github.com/chef/webmachine",
        {ref,"1389b01a9fbc25d36aad8956e08d2d0db242625f"}},
-  1}]}.
-[
-{pkg_hash,[
- {<<"fs">>, <<"9D147B944D60CFA48A349F12D06C8EE71128F610C90870BDF9A6773206452ED0">>},
- {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
- {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>}]}
-].
+  1}].