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.

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

Updates for network isolation and account key removal #309

Merged
merged 27 commits into from
Jul 10, 2024

Conversation

TomAugspurger
Copy link
Contributor

Updates to the deployment and runtime to

  1. Work with storage accounts where account key access is disabled
  2. Comply with stricter network isolation requirements

deployment/terraform/resources/batch.tf Outdated Show resolved Hide resolved
pctasks/run/pctasks/run/argo/client.py Outdated Show resolved Hide resolved
pctasks/run/pctasks/run/task/prepare.py Outdated Show resolved Hide resolved
scripts/publish Outdated Show resolved Hide resolved
Tom Augspurger added 2 commits July 9, 2024 09:14
Copy link
Contributor Author

@TomAugspurger TomAugspurger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I plan to merge this once CI passes.

@TomAugspurger
Copy link
Contributor Author

Test failures hopefully fixed (azurite doesn't support token credentials, so we need to use the account key in from_account_key, rather than generating a SAS token)

@TomAugspurger
Copy link
Contributor Author

New failure at https://github.com/microsoft/planetary-computer-tasks/actions/runs/9863208116/job/27235465737?pr=309#step:6:78.

=================================== FAILURES ===================================
__________________________ test_walk_match_full_path ___________________________

    def test_walk_match_full_path():
        storage = LocalStorage(HERE / ".." / "data-files" / "simple-assets")
        subdirs = {
            root: files
            for root, _, files in storage.walk(
                min_depth=1, max_depth=1, matches="a/asset-.*.json", match_full_path=True
            )
        }
>       assert subdirs["a"] == ["asset-a-1.json", "asset-a-2.json"]
E       AssertionError: assert ['asset-a-2.j...set-a-1.json'] == ['asset-a-1.j...set-a-2.json']
E         At index 0 diff: 'asset-a-2.json' != 'asset-a-1.json'
E         Use -v to get the full diff

I couldn't reproduce it. Updated the test to ignore the order...

@TomAugspurger
Copy link
Contributor Author

I don't know why the integration tests are failing (presumably auth?) but AFAICT there's nothing in the logs indicating what the issue is.

I haven't been able to run the integration tests locally. I'm inclined to just skip them at this point :/

Tom Augspurger added 2 commits July 10, 2024 07:12
This reverts commit aadd0ac.
@TomAugspurger
Copy link
Contributor Author

I think we'll need to revert some of the changes to the Helm chart removing the account key from the pctasks-server Deployment. IIUC these integration tests are using Azurite, which requires the account key. I'll try that quick.

@TomAugspurger
Copy link
Contributor Author

Wohoo, finally passing.

@TomAugspurger TomAugspurger merged commit 419b963 into main Jul 10, 2024
5 checks passed
@TomAugspurger TomAugspurger deleted the user/mjm/remove-access-keys branch July 10, 2024 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants