Skip to content

Commit 2eecb12

Browse files
authored
Notify when user doesn't have ListObjectVersions Permission (#3259)
* revert changes * messaging fix
1 parent 6f7aa97 commit 2eecb12

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ open class S3TreeDirectoryNode(bucket: S3VirtualBucket, parent: S3TreeDirectoryN
131131
bucket.handleDeletedBucket()
132132
return emptyList()
133133
} catch (e: S3Exception) {
134-
e.notifyError("Access denied to bucket")
134+
e.notifyError(message("s3.bucket.load.fail.title"))
135135
return buildList {
136136
if (continuationMarker != null) {
137137
add(S3TreeErrorContinuationNode(bucket, this@S3TreeDirectoryNode, this@S3TreeDirectoryNode.key, continuationMarker))
@@ -218,6 +218,22 @@ class S3TreeObjectNode(parent: S3TreeDirectoryNode, key: String, override val si
218218
} catch (e: NoSuchBucketException) {
219219
bucket.handleDeletedBucket()
220220
return emptyList()
221+
} catch (e: S3Exception) {
222+
e.notifyError(message("s3.object.load.fail.title"))
223+
return buildList {
224+
if (continuationMarker != null) {
225+
add(
226+
S3TreeErrorContinuationNode(
227+
bucket,
228+
this@S3TreeObjectNode,
229+
this@S3TreeObjectNode.key,
230+
continuationMarker
231+
)
232+
)
233+
} else {
234+
add(S3TreeErrorNode(bucket, this@S3TreeObjectNode))
235+
}
236+
}
221237
} catch (e: Exception) {
222238
LOG.error(e) { "Loading objects failed!" }
223239
return buildList {

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,7 @@ run_configuration_extension.feature.python.title=AWS connected Python Run Config
10501050
run_configuration_extension.inject_aws_connection_exception=Exception occurred attempting to inject region/credentials
10511051
run_configuration_extension.manual=Other credential profile/region
10521052
s3.bucket.label=Bucket Name/URI
1053+
s3.bucket.load.fail.title=Access denied to bucket
10531054
s3.bucket.name.label=Bucket Name:
10541055
s3.copy.bucket.action=Copy Name
10551056
s3.copy.path=Copy Path
@@ -1082,6 +1083,7 @@ s3.load_more_failed=Failed to load more! load more...
10821083
s3.name=Name
10831084
s3.new.folder=New Folder...
10841085
s3.new.folder.name=Folder name:
1086+
s3.object.load.fail.title=Unable to load objects - Access denied
10851087
s3.open.file_too_big=The editor cannot open files larger than {0}
10861088
s3.open.viewer.bucket.failed=Failed to open bucket
10871089
s3.open.viewer.bucket_does_not_exist=Bucket {0} does not exist.

0 commit comments

Comments
 (0)