Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/certifi-2023.7.22
Browse files Browse the repository at this point in the history
  • Loading branch information
drstrangelooker authored Dec 4, 2024
2 parents 4d992a8 + 88c8cca commit f4f0760
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 31 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @looker-open-source/cloud-looker-devrel
10 changes: 5 additions & 5 deletions .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ jobs:
- name: Upload pytest test results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: python-test-results
name: python-test-results-${{ matrix.os }}.py${{ matrix.python-version }}
path: results/

publish-test-results:
Expand All @@ -75,7 +75,7 @@ jobs:

steps:
- name: Download Artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
path: artifacts

Expand All @@ -85,7 +85,7 @@ jobs:
- name: Check Results Files Exist
id: check-results-exist
run: |
if [[ $(ls -l artifacts/python-test-results/*.xml 2> /dev/null | wc -l) -ge "1" ]]; then
if [[ $(ls -l artifacts/python-test-results-*/*.xml 2> /dev/null | wc -l) -ge "1" ]]; then
exit 0
else
curl --request POST \
Expand Down Expand Up @@ -115,4 +115,4 @@ jobs:
report_individual_runs: true
hide_comments: orphaned commits
check_run_annotations_branch: "*"
files: "artifacts/python-test-results/*.xml"
files: "artifacts/python-test-results*/*.xml"
25 changes: 0 additions & 25 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ docker run \
-v /local/path/to/ldeploy/settings:/ldeploy_settings \
-v /local/path/to/ldeploy/output:/ldeploy_output \
ldeploy content export \
--ini /ldeploy_settins/looker.ini \
--ini /ldeploy_settings/looker.ini \
--local-target /ldeploy_output \
<additional parameters>
```
Expand Down
7 changes: 7 additions & 0 deletions looker_deployer/commands/deploy_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ def create_or_return_space(space_name, parent_id, sdk):

try:
target_id = get_space_ids_from_name(space_name, parent_id, sdk)
if len(target_id) == 0 and "/" in space_name:
# If the folder name contains slashes then also check if it was previously imported with
# the slashes replaced with division slashes (Unicode character 2215) prior to PR #153.
target_id = get_space_ids_from_name(space_name.replace("/", "\u2215"), parent_id, sdk)
logger.debug("Space ID from name", extra={"id": target_id})
assert len(target_id) == 1
except AssertionError as e:
Expand Down Expand Up @@ -134,6 +138,9 @@ def build_spaces(spaces, sdk):
id_tracker = ["0"]

for space in spaces:
# Gazer replaces slashes in folder names with division slashes (Unicode character 2215), so undo that.
space = space.replace("\u2215", "/")

logger.debug("parent_id to use", extra={"id_tracker": id_tracker})
# Pull last value from id_tracker
space_parent = id_tracker.pop()
Expand Down

0 comments on commit f4f0760

Please sign in to comment.