Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

apm-ui: use the new kibana project layout #769

Merged
v1v merged 4 commits into from
Feb 21, 2020
Merged

apm-ui: use the new kibana project layout #769

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5810ff
apm-ui: location was changed
v1v Feb 21, 2020
2139bcf
lint: fix lint defects
v1v Feb 21, 2020
a4d02d8
support backward compatibility
v1v Feb 21, 2020
da4c63f
keep it as it was
v1v Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions scripts/kibana/validate-ts-interfaces-against-apm-server-sample-docs/scripts/clone-kibana.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#!/usr/bin/env bash

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fix a lint defect

set -e

OWNER=${1:-elastic}
BRANCH=${2:-master}

echo "Cloning Kibana: $OWNER:$BRANCH"
echo "Cloning Kibana: ${OWNER}:${BRANCH}"

cd ./tmp
git clone --depth 1 -b $BRANCH https://github.com/$OWNER/kibana.git
mv ./kibana/x-pack/legacy/plugins/apm/typings/es_schemas ./apm-ui-interfaces
cd ./tmp || true

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fix a lint defect

@sorenlouv sorenlouv Feb 21, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What does this do? Is it if it fails navigating to ./tmp we want to continue?

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, have you got a different suggestion?

@sorenlouv sorenlouv Feb 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm wondering why this would fail - and fix the root cause of that.

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'll keep as it was then

@v1v v1v Feb 21, 2020 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

rollback my changes, to keep it as it was

git clone --quiet --depth 1 -b "${BRANCH}" "https://github.com/${OWNER}/kibana.git"

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

  • reduce verbose output in the CI.
  • fix a lint defect

@sorenlouv sorenlouv Feb 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I originally made this git clone a little more complicated than it has to be. What I wanted was a partial checkout of just a specific path (to make it faster). I didn't find any simple ways to do that.
I don't think I saw any perf improvements by using the --depth flag (but not 100%)

@sorenlouv sorenlouv Feb 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

But you don't have to change this. Just thought I'd mention it.

mv ./kibana/x-pack/plugins/apm/typings/es_schemas ./apm-ui-interfaces

@v1v v1v Feb 21, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

The real change!
Question:

  • Do we need to support backward compatibility?

if so

newLocation=./kibana/x-pack/plugins/apm/typings/es_schemas
location=./kibana/x-pack/legacy/plugins/apm/typings/es_schemas
if [ -d "${newLocation}" ] ; then
   location=${newLocation}
fi
mv "${location} ./apm-ui-interfaces

@sorenlouv sorenlouv Feb 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Good question. If the above works I think that's a good approach. Perhaps add a comment saying that in 7.7 files moved around. Then we can move this again in a couple of minors from now.

rm -rf kibana