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

Azure Arc extension #10400

Merged
merged 45 commits into from
May 18, 2020
Merged

Azure Arc extension #10400

merged 45 commits into from
May 18, 2020

Conversation

bergeron
Copy link
Contributor

  • Adds extensions/arc for managing Azure Arc resources.
  • Only the Postgres resource is in this PR. SQL will come next.
    • Overview, connection strings, and properties pages implemented.
  • The UI is built with a ModelViewDashboard.
  • Communication with the Arc data controller is done via typescript clients and models generated from the controller's swagger specification.
    • See extensions/arc/src/controller/README.md
  • I know GitHub makes large PRs hard to read, so let me know if I can make this easier by splitting it up (e.g. removing the generated clients)

Brian Bergeron and others added 30 commits April 6, 2020 14:16
(cherry picked from commit 3ceed3e)
@coveralls
Copy link

coveralls commented May 14, 2020

Coverage Status

Coverage increased (+0.05%) to 33.946% when pulling e328347 on brberger/arc-postgres into 19fab3f on master.

Copy link
Contributor

@Charles-Gagnon Charles-Gagnon left a comment

Choose a reason for hiding this comment

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

extensions/arc/package.json Outdated Show resolved Hide resolved
extensions/arc/package.json Outdated Show resolved Hide resolved
extensions/arc/package.json Outdated Show resolved Hide resolved
extensions/arc/src/constants.ts Outdated Show resolved Hide resolved
extensions/arc/src/controller/auth.ts Show resolved Hide resolved
src/sql/azdata.proposed.d.ts Outdated Show resolved Hide resolved
extensions/arc/package.json Outdated Show resolved Hide resolved
extensions/arc/package.json Show resolved Hide resolved
Copy link
Contributor

@Charles-Gagnon Charles-Gagnon left a comment

Choose a reason for hiding this comment

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

Looks like you have a conflict in gulp.hygiene.js now actually

@bergeron
Copy link
Contributor Author

Looks like you have a conflict in gulp.hygiene.js now actually

The build is failing because of a merge conflict in that file. But I'm confused because I can't reproduce any conflict. This PR doesn't report a conflict, and I don't get a conflict when I merge my branch into master on the command line.

Copy link
Contributor

@aaomidi aaomidi left a comment

Choose a reason for hiding this comment

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

The hygeine file needs to change so it doesn't show a conflict

@@ -109,7 +109,8 @@ const indentationFilter = [
'!extensions/sql-database-projects/src/test/baselines/*.sqlproj',
'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts',
'!extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts',
'!resources/linux/snap/electron-launch'
'!resources/linux/snap/electron-launch',
Copy link
Contributor

Choose a reason for hiding this comment

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

You can't add stuff here to the bottom of the list, you need to add it to the middle of the list or you'll get conflicts like this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Well that's weird. Why? Is the distro merge adding stuff onto the end that it's conflicting with or something?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah the distro has stuff at the end of this. There's a cleanup we can do there to make sure this stops conflicting.

@anthonydresser do you think we can make a new array in distro and append it programmatically to this array? I've seen this issue come up a bunch of times now.

}

protected async registerTabs(modelView: azdata.ModelView): Promise<(azdata.DashboardTab | azdata.DashboardTabGroup)[]> {
await Promise.all([this._controllerModel.refresh(), this._databaseModel.refresh()]);
Copy link
Contributor

Choose a reason for hiding this comment

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

We'll want to change this before we ship so that there's some indication that it's in a loading state - otherwise it might just be sitting there on an empty blank page for a while if the controller is slow to respond.

Copy link
Contributor

@aaomidi aaomidi left a comment

Choose a reason for hiding this comment

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

LGTM!

@bergeron bergeron merged commit 283ffd7 into master May 18, 2020
@Charles-Gagnon Charles-Gagnon deleted the brberger/arc-postgres branch May 27, 2020 23:35
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.

5 participants