diff --git a/Gemfile b/Gemfile index 024a9f5..19d3fe7 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,11 @@ source "https://rubygems.org" -gem "entitlements", "0.1.7" +gem "entitlements", "0.1.8" +gem "entitlements-github-plugin", "0.0.2" gem "contracts" gem "faraday" gem "net-ldap" -gem "octokit" gem "concurrent-ruby" gem "sawyer" gem 'debase' diff --git a/Gemfile.lock b/Gemfile.lock index 18b6368..5f2bf17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,47 +1,56 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) concurrent-ruby (1.1.9) contracts (0.16.0) debase (0.2.4.1) debase-ruby_core_source (>= 0.10.2) - debase-ruby_core_source (0.10.15) - entitlements (0.1.7) + debase-ruby_core_source (0.10.16) + entitlements (0.1.8) concurrent-ruby (= 1.1.9) contracts (= 0.16.0) - faraday (>= 0.17.3, < 0.18) net-ldap (~> 0.17.0) - octokit (~> 4.18) optimist (= 3.0.0) - faraday (0.17.4) - multipart-post (>= 1.2, < 3) - multipart-post (2.1.1) - net-ldap (0.17.0) - octokit (4.21.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + entitlements-github-plugin (0.0.2) + concurrent-ruby (= 1.1.9) + contracts (= 0.16.0) + faraday (>= 1, < 3) + net-ldap (~> 0.17.0) + octokit (~> 4.25) + optimist (= 3.0.0) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.0) + net-ldap (0.17.1) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) optimist (3.0.0) - public_suffix (4.0.6) + public_suffix (5.0.0) rake (13.0.6) ruby-debug-ide (0.7.3) rake (>= 0.8.1) - sawyer (0.8.2) + ruby2_keywords (0.0.5) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) PLATFORMS - ruby - x86_64-darwin-19 + x86_64-darwin-20 DEPENDENCIES concurrent-ruby contracts debase - entitlements (= 0.1.7) + entitlements (= 0.1.8) + entitlements-github-plugin (= 0.0.2) faraday net-ldap - octokit ruby-debug-ide sawyer + +BUNDLED WITH + 2.3.9 diff --git a/config/entitlements.yaml b/config/entitlements.yaml index 6d79672..84bdfe7 100644 --- a/config/entitlements.yaml +++ b/config/entitlements.yaml @@ -1,14 +1,12 @@ <%- -begin - require_relative "/data/entitlements/lib/entitlements-and-plugins" -rescue Exception - begin - require_relative "lib/entitlements-and-plugins" - rescue Exception - # We might not have the plugins installed and still want this file to be - # loaded. Don't raise anything but silently fail. - end -end +ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", File.dirname(__FILE__)) +require "bundler/setup" +require "entitlements" + +# require entitlements plugins here +require "entitlements/backend/github_org" +require "entitlements/backend/github_team" +require "entitlements/service/github" -%> --- backends: @@ -37,6 +35,13 @@ groups: base: ou=strictly-audited,ou=Entitlements,ou=Groups,dc=example,dc=org dir: entitlements/strictly-audited create_if_missing: true + github.com/danhoerst-test/teams: + addr: <%= ENV["GITHUB_API_BASE"] %> + base: ou=teams,ou=github,ou=GitHub,dc=github,dc=com + dir: github.com/danhoerst-test/org + org: danhoerst-test + token: <%= ENV["GITHUB_ORG_TOKEN"] %> + type: "github_org" people: ldap: type: ldap diff --git a/github.com/danhoerst-test/org/admin.txt b/github.com/danhoerst-test/org/admin.txt new file mode 100644 index 0000000..945a761 --- /dev/null +++ b/github.com/danhoerst-test/org/admin.txt @@ -0,0 +1,3 @@ +description = Admins of the danhoerst-test org +username = danhoerst +username = rick diff --git a/github.com/danhoerst-test/org/member.txt b/github.com/danhoerst-test/org/member.txt new file mode 100644 index 0000000..60c772c --- /dev/null +++ b/github.com/danhoerst-test/org/member.txt @@ -0,0 +1,6 @@ +description = Members of the danhoerst-test + +# Prefer admin over member if defined in both places +group != github.com/github/org/admin +metadata_no_conditions_ok = true +metadata_no_members_ok = true diff --git a/vendor/cache/addressable-2.8.0.gem b/vendor/cache/addressable-2.8.0.gem deleted file mode 100644 index 1e41e1c..0000000 Binary files a/vendor/cache/addressable-2.8.0.gem and /dev/null differ diff --git a/vendor/cache/addressable-2.8.1.gem b/vendor/cache/addressable-2.8.1.gem new file mode 100644 index 0000000..17e4257 Binary files /dev/null and b/vendor/cache/addressable-2.8.1.gem differ diff --git a/vendor/cache/debase-ruby_core_source-0.10.15.gem b/vendor/cache/debase-ruby_core_source-0.10.15.gem deleted file mode 100644 index 5bc4a02..0000000 Binary files a/vendor/cache/debase-ruby_core_source-0.10.15.gem and /dev/null differ diff --git a/vendor/cache/debase-ruby_core_source-0.10.16.gem b/vendor/cache/debase-ruby_core_source-0.10.16.gem new file mode 100644 index 0000000..bcddeb2 Binary files /dev/null and b/vendor/cache/debase-ruby_core_source-0.10.16.gem differ diff --git a/vendor/cache/entitlements-0.1.7.gem b/vendor/cache/entitlements-0.1.7.gem deleted file mode 100644 index 935674c..0000000 Binary files a/vendor/cache/entitlements-0.1.7.gem and /dev/null differ diff --git a/vendor/cache/entitlements-0.1.8.gem b/vendor/cache/entitlements-0.1.8.gem new file mode 100644 index 0000000..36412b0 Binary files /dev/null and b/vendor/cache/entitlements-0.1.8.gem differ diff --git a/vendor/cache/entitlements-github-plugin-0.0.2.gem b/vendor/cache/entitlements-github-plugin-0.0.2.gem new file mode 100644 index 0000000..c4f4c3a Binary files /dev/null and b/vendor/cache/entitlements-github-plugin-0.0.2.gem differ diff --git a/vendor/cache/faraday-0.17.4.gem b/vendor/cache/faraday-0.17.4.gem deleted file mode 100644 index f66fce6..0000000 Binary files a/vendor/cache/faraday-0.17.4.gem and /dev/null differ diff --git a/vendor/cache/faraday-2.5.2.gem b/vendor/cache/faraday-2.5.2.gem new file mode 100644 index 0000000..a66f174 Binary files /dev/null and b/vendor/cache/faraday-2.5.2.gem differ diff --git a/vendor/cache/faraday-net_http-3.0.0.gem b/vendor/cache/faraday-net_http-3.0.0.gem new file mode 100644 index 0000000..a990f3a Binary files /dev/null and b/vendor/cache/faraday-net_http-3.0.0.gem differ diff --git a/vendor/cache/multipart-post-2.1.1.gem b/vendor/cache/multipart-post-2.1.1.gem deleted file mode 100644 index 027956d..0000000 Binary files a/vendor/cache/multipart-post-2.1.1.gem and /dev/null differ diff --git a/vendor/cache/net-ldap-0.17.0.gem b/vendor/cache/net-ldap-0.17.0.gem deleted file mode 100644 index 1b8031f..0000000 Binary files a/vendor/cache/net-ldap-0.17.0.gem and /dev/null differ diff --git a/vendor/cache/net-ldap-0.17.1.gem b/vendor/cache/net-ldap-0.17.1.gem new file mode 100644 index 0000000..76462c6 Binary files /dev/null and b/vendor/cache/net-ldap-0.17.1.gem differ diff --git a/vendor/cache/octokit-4.21.0.gem b/vendor/cache/octokit-4.21.0.gem deleted file mode 100644 index b938820..0000000 Binary files a/vendor/cache/octokit-4.21.0.gem and /dev/null differ diff --git a/vendor/cache/octokit-4.25.1.gem b/vendor/cache/octokit-4.25.1.gem new file mode 100644 index 0000000..6f25e59 Binary files /dev/null and b/vendor/cache/octokit-4.25.1.gem differ diff --git a/vendor/cache/public_suffix-4.0.6.gem b/vendor/cache/public_suffix-4.0.6.gem deleted file mode 100644 index 6f183f4..0000000 Binary files a/vendor/cache/public_suffix-4.0.6.gem and /dev/null differ diff --git a/vendor/cache/public_suffix-5.0.0.gem b/vendor/cache/public_suffix-5.0.0.gem new file mode 100644 index 0000000..6b6ed52 Binary files /dev/null and b/vendor/cache/public_suffix-5.0.0.gem differ diff --git a/vendor/cache/ruby2_keywords-0.0.5.gem b/vendor/cache/ruby2_keywords-0.0.5.gem new file mode 100644 index 0000000..d311c5d Binary files /dev/null and b/vendor/cache/ruby2_keywords-0.0.5.gem differ diff --git a/vendor/cache/sawyer-0.8.2.gem b/vendor/cache/sawyer-0.8.2.gem deleted file mode 100644 index f8b8f8a..0000000 Binary files a/vendor/cache/sawyer-0.8.2.gem and /dev/null differ diff --git a/vendor/cache/sawyer-0.9.2.gem b/vendor/cache/sawyer-0.9.2.gem new file mode 100644 index 0000000..5213eb8 Binary files /dev/null and b/vendor/cache/sawyer-0.9.2.gem differ