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

Simplify explorer service node #1092

Merged
merged 5 commits into from
Jul 18, 2019
Merged

Conversation

abrooksv
Copy link
Contributor

Description

  • Pull data from enum so it is in one place
  • Rename serviceName to serviceId since that is more accurate

Motivation and Context

Related Issue(s)

Testing

Validated Explorer still works

Screenshots (if appropriate)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

@abrooksv abrooksv requested a review from a team as a code owner July 16, 2019 19:52
* Pull data from enum so it is in one place
* Rename serviceName to serviceId since that is more accurate
@abrooksv abrooksv force-pushed the abrooksv-simplifyExplorerServiceNode branch from ac4a316 to fca3284 Compare July 16, 2019 20:29
@codecov-io
Copy link

codecov-io commented Jul 16, 2019

Codecov Report

Merging #1092 into master will decrease coverage by 13.57%.
The diff coverage is 57.14%.

Impacted file tree graph

@@              Coverage Diff              @@
##             master    #1092       +/-   ##
=============================================
- Coverage     60.13%   46.55%   -13.58%     
+ Complexity      723      578      -145     
=============================================
  Files           176      176               
  Lines          6135     6135               
  Branches        710      710               
=============================================
- Hits           3689     2856      -833     
- Misses         2146     3050      +904     
+ Partials        300      229       -71
Flag Coverage Δ Complexity Δ
#integtest ? ?
#uitest ? ?
#unittest 46.55% <57.14%> (+0.06%) 578 <2> (+1) ⬆️
Impacted Files Coverage Δ Complexity Δ
...kits/jetbrains/core/explorer/ExplorerToolWindow.kt 0% <0%> (ø) 0 <0> (ø) ⬇️
...ins/core/explorer/nodes/AwsExplorerResourceNode.kt 40% <0%> (ø) 1 <0> (ø) ⬇️
...oolkits/jetbrains/services/lambda/ExplorerNodes.kt 56% <100%> (+2.15%) 0 <0> (ø) ⬇️
...ices/cloudformation/CloudFormationExplorerNodes.kt 84.21% <100%> (ø) 0 <0> (ø) ⬇️
...kits/jetbrains/core/explorer/AwsExplorerService.kt 60% <60%> (+60%) 1 <1> (+1) ⬆️
.../core/explorer/nodes/AwsExplorerServiceRootNode.kt 66.66% <66.66%> (-33.34%) 1 <1> (ø)
.../jetbrains/services/telemetry/MessageBusService.kt 0% <0%> (-100%) 0% <0%> (ø)
...tials/ExtensionPointCredentialsProviderRegistry.kt 0% <0%> (-92.86%) 0% <0%> (-3%)
...ns/services/lambda/python/PythonSamDebugSupport.kt 0% <0%> (-88.89%) 0% <0%> (-3%)
...s/jetbrains/ui/wizard/IntelliJSdkSelectionPanel.kt 0% <0%> (-84.22%) 0% <0%> (-6%)
... and 66 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6c951de...6930ffd. Read the comment docs.

@@ -16,7 +16,11 @@ import javax.swing.Icon
*
Copy link
Contributor

Choose a reason for hiding this comment

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

This whole file just looks like formatting.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ya, will revert


class CloudFormationServiceNode(
project: Project,
explorerService: AwsExplorerService
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the value of passing this in vs having it be part of the CloudFormationServiceNode implementation? Is there a time where explorerService would be anything other than AwsExplorerService. CLOUDFORMATION ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That....is a great question. Got blinders on and didnt see the obvious thing.

@abrooksv abrooksv merged commit cb47114 into master Jul 18, 2019
@abrooksv abrooksv deleted the abrooksv-simplifyExplorerServiceNode branch July 18, 2019 20:56
zhangzhx pushed a commit that referenced this pull request Jul 30, 2019
kiiadi pushed a commit that referenced this pull request Jul 30, 2019
* Switch out our test logger (#1027)

* Fixing alternative IDE logic so that it runs for every runTask defined in the project. (#1029)

* Refactor New Project Wizard to extensions to support other platforms (#1022)

* Fix the bug when project is not located in the same drive of temp fol… (#1034)

* Fix the refresh vfs in ReadAction bug. (#1060)

* Fix the refresh vfs in ReadAction bug.
* Use sam build folder to avoid recursive copying.

* Fix exceptions thrown in a run config breaking the Run Config action button (#896)

* Resolve some TODOs to simplify the LambdaBuilder logic
* Make sure all exceptions get mapped into CompletableFuture.completeExceptionally

* Enable using the presence of a requirements.txt to determine if a met… (#1056)

* Enable using the presence of a requirements.txt to determine if a method is a handler in Python

* This allows us to not rely on source roots but instead matches what SAM build will do, which is look for the requirements.txt at the codeUri location
* Fix broken test that had incorrect assertion and behavior
* Fix tests not testing the correct things

* Fix dynamodb template for python not creating successfully. (#1071)

* Remove anonymized. (#1074)

* Only build the specified lambda function when running/debugging from (#1075)

* Remove the BaseState system from run configs (#1073)

* It kept having aliasing issues related to editing a cloned run config
* It kept us from 192 due to NoSuchMethod error

* Fix exceptions while generating projects and on run config validation (#1077)

- Fix exception on startup while gathering SAM CLI information; replace synchronous execution on EDT with modifying project model after project is initialized
- Fix validation for template.yaml file to be able to call SAM deploy action
- Fix sync calls on run configuration validation to use async calls
- Add tests to verify SamVersion evaluation and getFileInfo logic

* Fix LocalLambdaRunConfiguration tests broken by async SAM version check (#1079)

* Move test back to unit test package
* Make FileInfoCache async based
* Move logic up from SAM version cache to FileInfoCache
* Tweak the evaluateBlocking to throw if not successful
* Move tests around and update to match the current state of the world

* Switch UI tests to use a regex for SDK selection (#1084)

* This allows tests to run with Java 11 or Java 8

* Fix Virtual File System refresh after new project is generated (#1083)

* Refresh Vfs after project is updated from SAM CLI to sync it with File System
* WriteAction is not necessary while SAM project is generated since there is no interaction with VFS. We refresh VFS after files are copied.

* Re-enable 192 EAP (#1076)

* Revert "Revert "Enable toolkit in 192 (#1000)" (#1007)"

This reverts commit fcdfa2c.

* Remove warning around state variable name
* Make sure Java lambdas tests compile as 1.8
* Fix incompatible plugin versions
* Suppress and comment deprecation
* Fix SAM SemVer tests since now 192 cares about things after the patch version

* Fix toString() on SDK choices in UI test framework (#1085)

* Fix Java UI tests on 2018.3 (#1086)

* Fix read/write action errors when invoking a SAM lambda (#1087)

* Fix Windows SAM detection tests not running on Windows (#1089)

* Push coverage to CodeCov

* Add test artifact saving for linux-based CI jobs (#1088)

* Add test artifact saving for linux-based CI jobs

* Backfill credential management document (#1055)

* Break up the AwsExplorerNodes (#1091)

* No functional changes were made

* Remove unused code (#1093)

* Wrap credential retrieving with progress indication if on UI thread (#1096)

* This pushes the network call itself to a background thread while showing a progress bar that we are doing something. This is what is suggested by https://github.com/JetBrains/intellij-community/blob/62d0e1a5010fef3369d91b670a3cc7b11ac73ba1/platform/platform-api/src/com/intellij/execution/process/OSProcessHandler.java#L105

* Remove the endpoints.json URL that does not use HTTPS (#1097)

* Add changelog for #1096 (#1098)

* Pull in latest AWS SDK to update Lambda models (#1100)

* Simplify explorer service node (#1092)

* Rename some of the local and remote lambda class names to be more consistent. (#1101)

* Update to stable 192 versions, fix UI tests (#1106)

* Fix the ui tests since 192 changes JBTabs to a brand new system

* Remove LambdaHandlerIndex (#1107)

* In 192, we were showing that we were triggering reentrant indexing. Since we only use this for Java handler completion, we will remove it.

* Updating version to 1.5

* Updating SNAPSHOT version to 1.6-SNAPSHOT

* Fix Create Lambda action missing from explorer menu (#1111)

* Implement resource cache - to be used for caching describe calls. (#1102)

* Support Gradle link (#1080)

* Add library test in Gradle UI test and change the importing behavior to background async.

* Fork JetBrains' AsyncTreeModel to remove the read action requirement (#1110)

* JetBrain's Invoker is forced to run under a read action, fork the Invoker and AsyncTreeModel (and supporting classes) to remove that requirement
* Increase min version to drop 183 EAP builds, implement abstract method that wasnt implemented in earlier versions

* Add IU 192 profile
zhangzhx pushed a commit that referenced this pull request Aug 1, 2019
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.

3 participants