Modify csharp project so package supports both x64 and arm64 under macOS

.github/workflows/cla.yml

@@ -22,7 +22,7 @@ jobs:
           remote-repository-name: cla-signatures
           path-to-signatures: individual.json
           branch: main
-          allowlist: dhatch,gj,gkaemmer,gneray,leina05,litonico,samscott89,saolsen,ssglaser,patrickod,gw000
+          allowlist: gj,gkaemmer,gneray,gw000,kreuter,laxjesse,litonico,patrickod,samscott89,saolsen,ssglaser,sverch,vrama628
           use-dco-flag: false
           create-file-commit-message: 'Creating file for storing CLA signatures'
           signed-commit-message: '$contributorName has signed the CLA in osohq/oso#$pullRequestNo'

.github/workflows/docs-preview.yml

@@ -75,6 +75,14 @@ jobs:
         run: |
           wget https://github.com/bep/s3deploy/releases/download/v2.4.0/s3deploy_2.4.0_Linux-64bit.deb
           sudo dpkg -i s3deploy_2.4.0_Linux-64bit.deb
+      # This step flakes sometime as in this run:
+      # https://github.com/osohq/oso/runs/4743006731?check_suite_focus=true
+      # This slows down releasing.
+      # Try to retry, and get some more info about why the flake is happening.
       - name: Build docs for CI preview
-        run: make deploy-ci DOCS_TAG=${{ env.BRANCH_NAME }}
-        working-directory: docs
+        uses: nick-invision/retry@v2
+        with:
+          max_attempts: 2
+          timeout_minutes: 4
+          command: make -C docs deploy-ci DOCS_TAG=${{ env.BRANCH_NAME }}
+          on_retry_command: ls docs/examples/quickstart/ruby

.github/workflows/publish-docs.yml

@@ -6,16 +6,16 @@ on:
         description: "docs s3 path (docs.oso.dev or docs-preview.oso.dev)"
       oso_version:
         description: "oso release to build docs for"
-        default: "0.25.0" # oso_version
+        default: "0.26.1" # oso_version
       flask_oso_version:
         description: "flask oso release to build docs for"
-        default: "0.25.0" # flask_oso_version
+        default: "0.26.0" # flask_oso_version
       django_oso_version:
         description: "django oso release to build docs for"
-        default: "0.25.0" # django_oso_version
+        default: "0.26.0" # django_oso_version
       sqlalchemy_oso_version:
         description: "sqlalchemy oso release to build docs for"
-        default: "0.25.0" # sqlalchemy_oso_version
+        default: "0.26.0" # sqlalchemy_oso_version
 jobs:
   publish:
     name: Publish docs

.github/workflows/publish.yml

@@ -6,6 +6,17 @@ on:
         description: "Version Number"
         required: true
 jobs:
+  mark-latest:
+    # Mark the release about to be published as latest.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark release as latest
+        uses: tubone24/[email protected]
+        with:
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: "v${{ github.event.inputs.version }}"
   go:
     # Notifies the go-oso repo there's a new release.
     # CI over there then pulls this tag, commits and pushes their own tag.

.github/workflows/release.yml

@@ -112,6 +112,8 @@ jobs:
         run: mv target/aarch64-apple-darwin/release/libpolar.a target/aarch64-apple-darwin/release/libpolar-macOS-arm.a
       - name: Rename dynamic lib
         run: mv target/aarch64-apple-darwin/release/libpolar.dylib target/aarch64-apple-darwin/release/libpolar-arm.dylib
+      - name: Merge dynamic libs into fat dynamic lib
+        run: lipo -create target/release/libpolar.dylib target/aarch64-apple-darwin/release/libpolar-arm.dylib -output target/libpolar-fat.dylib
       - uses: actions/upload-artifact@v2
         with:
           name: oso_library
@@ -120,6 +122,10 @@ jobs:
         with:
           name: oso_library
           path: target/aarch64-apple-darwin/release/libpolar-arm.dylib
+      - uses: actions/upload-artifact@v2
+        with:
+          name: oso_library
+          path: target/libpolar-fat.dylib
       - uses: actions/upload-artifact@v2
         with:
           name: oso_static_library
@@ -236,7 +242,7 @@ jobs:
           mkdir -p languages/java/oso/src/main/resources/linux
           cp -r oso_library/libpolar.so languages/java/oso/src/main/resources/linux/
           mkdir -p languages/java/oso/src/main/resources/macos
-          cp -r oso_library/libpolar.dylib languages/java/oso/src/main/resources/macos/
+          cp -r oso_library/libpolar-fat.dylib languages/java/oso/src/main/resources/macos/libpolar.dylib
           mkdir -p languages/java/oso/src/main/resources/win
           cp -r oso_library/polar.dll languages/java/oso/src/main/resources/win/
       - name: Test
@@ -537,7 +543,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-11, windows-latest]
-        go-version: ["1.12", "1.13", "1.14", "1.15", "1.16", "1.17"]
+        go-version: ["1.14", "1.15", "1.16", "1.17"]
     steps:
       - uses: actions/checkout@v2
       - name: Set version env
@@ -552,23 +558,21 @@ jobs:
         with:
           name: go
       - name: "test"
+        env:
+          POLAR_IGNORE_NO_ALLOW_WARNING: 1
         run: |
           go build
-          go test -v ./tests/
+          go test -v ./internal/host
+          cd tests && go test -v
+
         working-directory: go
       - name: "test musl"
-        # TODO(gj): the dependency fetching step in the
-        # tetafro/golang-gcc:1.12-alpine image seems to require Git (unlike Go
-        # versions 1.13 -> 1.17), and the image doesn't contain Git. We could
-        # create our own image that extends tetafro/golang-gcc:1.12-alpine and
-        # contains Git, but for now I'm skipping it.
-        if: runner.os == 'Linux' && matrix.go-version != '1.12'
-        run: docker run --rm -v `pwd`:/oso tetafro/golang-gcc:${{ matrix.go-version }}-alpine /bin/sh -c 'cd /oso && go test -v ./tests/'
+        if: runner.os == 'Linux'
+        run: docker run --rm --env POLAR_IGNORE_NO_ALLOW_WARNING=1 -v `pwd`:/oso tetafro/golang-gcc:${{ matrix.go-version }}-alpine /bin/sh -c 'cd /oso && go test -v ./internal/host && cd tests && go test -v'
         working-directory: go
-        # TODO(steve) buster has the same problem on 1.12. But is it the same problem???
       - name: "test buster"
-        if: runner.os == 'Linux' && matrix.go-version != '1.12'
-        run: docker run --rm -v `pwd`:/oso golang:${{ matrix.go-version }}-buster /bin/sh -c 'cd /oso && go test -v ./tests/'
+        if: runner.os == 'Linux'
+        run: docker run --rm --env POLAR_IGNORE_NO_ALLOW_WARNING=1 -v `pwd`:/oso golang:${{ matrix.go-version }}-buster /bin/sh -c 'cd /oso && go test -v ./internal/host && cd tests && go test -v'
         working-directory: go
 
   validate_go_macos_arm:
@@ -591,9 +595,11 @@ jobs:
       - name: "test"
         run: |
           ~/go/bin/go${{ matrix.go-version }} build
-          ~/go/bin/go${{ matrix.go-version }} test -v ./tests/ 
+          ~/go/bin/go${{ matrix.go-version }} test -v ./internal/host
+          cd tests && ~/go/bin/go${{ matrix.go-version }} test -v
         working-directory: go
         env:
+          POLAR_IGNORE_NO_ALLOW_WARNING: 1
           CGO_ENABLED: 1
           GOOS: darwin
           GOARCH: arm64
@@ -730,7 +736,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
       - name: Set version env
@@ -927,10 +933,10 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-debug-${{ hashFiles('**/Cargo.lock') }}
-      - name: Use Python 3.6
+      - name: Use Python 3.7
         uses: actions/setup-python@v1
         with:
-          python-version: "3.6"
+          python-version: "3.7"
       - name: Use Ruby 2.4
         uses: ruby/setup-ruby@v1
         with:
@@ -951,10 +957,10 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      - name: Use Go 1.12
+      - name: Use Go 1.14
         uses: actions/setup-go@v2
         with:
-          go-version: "1.12"
+          go-version: "1.14"
       - name: Run quickstart tests
         run: make -C docs test-quickstarts-release
 

.github/workflows/test.yml

@@ -43,10 +43,10 @@ jobs:
           args: --all-features --all-targets -- -D warnings
 
       ## Check Python
-      - name: Install Python 3.6
+      - name: Install Python 3.7
         uses: actions/setup-python@v1
         with:
-          python-version: "3.6"
+          python-version: "3.7"
       - name: Install Python formatter
         run: pip install black
       - name: Check Python formatting
@@ -335,10 +335,10 @@ jobs:
           toolchain: stable
           override: true
           components: rustfmt, clippy
-      - name: Use Go 1.12
+      - name: Use Go 1.14
         uses: actions/setup-go@v2
         with:
-          go-version: "1.12"
+          go-version: "1.14"
       - name: Test go
         run: make go-test
 
@@ -358,10 +358,10 @@ jobs:
             ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
             ${{ runner.os }}-cargo-test-
 
-      - name: Install Python 3.6
+      - name: Install Python 3.7
         uses: actions/setup-python@v1
         with:
-          python-version: "3.6"
+          python-version: "3.7"
 
       - name: install aspell
         run: sudo apt-get install aspell

.gitignore

@@ -193,3 +193,5 @@ polar-wasm-api/pkg/*
 # Algolia tool
 docs/searcher
 docs/search/vendor/*
+
+.nvmrc

.vscode/settings.json

@@ -0,0 +1,65 @@
+{
+    "python.formatting.provider": "black",
+    "oso.polarLanguageServer.metrics.enabled": "off",
+    "oso.polarLanguageServer.projectRoots": [
+        // This is the full set of folders (currently) that have policies
+        // `fd -e polar | rg ".*/" -o | sort -u`
+        // 
+        // We cannot enable them all, or we would have 50 versions of
+        // the extension running. You can uncomment one if you're working on it
+        //
+        // "docs/examples/add-to-your-application/",
+        // "docs/examples/add-to-your-application/go/",
+        // "docs/examples/add-to-your-application/node/",
+        // "docs/examples/add-to-your-application/python/",
+        // "docs/examples/add-to-your-application/ruby/",
+        // "docs/examples/context/",
+        // "docs/examples/data_access/django/example/app/policy/",
+        // "docs/examples/data_access/sqlalchemy/sqlalchemy_example/",
+        // "docs/examples/data_filtering/",
+        // "docs/examples/gitclub/backends/express-typeorm/src/",
+        // "docs/examples/gitclub/backends/flask-sqlalchemy-oso/app/",
+        // "docs/examples/gitclub/backends/flask-sqlalchemy/app/",
+        // "docs/examples/gitclub/backends/rails/app/policy/",
+        // "docs/examples/inheritance/",
+        // "docs/examples/quickstart/go/",
+        // "docs/examples/quickstart/java/src/main/java/quickstart/",
+        // "docs/examples/quickstart/nodejs/",
+        // "docs/examples/quickstart/python/app/",
+        // "docs/examples/quickstart/ruby/",
+        // "docs/examples/quickstart/rust/",
+        // "docs/examples/rbac/",
+        // "docs/examples/rbac/go/",
+        // "docs/examples/rbac/java/",
+        // "docs/examples/rbac/nodejs/",
+        // "docs/examples/rbac/python/",
+        // "docs/examples/rbac/ruby/",
+        // "docs/examples/user_types/java/",
+        // "docs/examples/user_types/nodejs/",
+        // "docs/examples/user_types/python/",
+        // "docs/examples/user_types/ruby/",
+        // "languages/go/",
+        // "languages/go/tests/",
+        // "languages/go/tests/other/",
+        // "languages/java/oso/src/test/java/com/osohq/oso/",
+        // "languages/java/oso/src/test/java/com/osohq/oso/other/",
+        // "languages/java/oso/src/test/resources/",
+        // "languages/python/django-oso/tests/",
+        // "languages/python/django-oso/tests/test_app/policy/",
+        // "languages/python/flask-oso/tests/",
+        // "languages/python/oso/tests/",
+        // "languages/python/oso/tests/other/",
+        // "languages/python/oso/tests/parity/policies/",
+        // "languages/ruby/spec/oso/polar/",
+        // "languages/ruby/spec/oso/polar/data_filtering/",
+        // "languages/ruby/spec/oso/polar/other/",
+        // "languages/rust/",
+        // "languages/rust/oso/",
+        // "languages/rust/oso/tests/",
+        // "languages/rust/oso/tests/other/",
+        "polar-core",
+        "test",
+        // "vscode/oso/test-fixtures/workspace/a/",
+        // "vscode/oso/test-fixtures/workspace/b/",
+    ]
+}