diff --git a/docs/sdks/js/example-bucket-policy.js b/docs/sdks/js/example-bucket-policy.js index 6e4525cb..6a412c88 100644 --- a/docs/sdks/js/example-bucket-policy.js +++ b/docs/sdks/js/example-bucket-policy.js @@ -3,12 +3,11 @@ var AWS = require('aws-sdk'); var config = { - accessKeyId: "MINIO_ACCESS_ID", - secretAccessKey: "MINIO_SECRET_ID", + accessKeyId: "AC5NH40NQLTL4D2W92PM", + secretAccessKey: "H+AVh8q5G7hEH2r3WxFP135+Q19Aw8yXWel8IGh/HrEjZyTNx/n4Xw==", endpoint: "localhost:9000", region: "", sslEnabled: false, - s3ForcePathStyle: true }; AWS.config.update(config); @@ -19,12 +18,12 @@ var statement = { Sid: "ExampleStatemenent1", Effect: "Allow", Principal: { - AWS: "minio::Account-Id:user/Dave" + AWS: "minio::1111111:murphy" }, Action: [ - "s3.ListBucket", - "s3.GetObject", - "s3.PutObject", + "s3:ListBucket", + "s3:GetObject", + "s3:PutObject", ], Resource: [ "minio:::examplebucket" @@ -37,7 +36,7 @@ var policy = { } var params = { - Bucket: 'new-bucket', + Bucket: 'newbucket', Policy: JSON.stringify(policy), } @@ -50,7 +49,7 @@ s3.putBucketPolicy(params, function(err, data) { }); var params = { - Bucket: 'new-bucket' + Bucket: 'newbucket' }; s3.getBucketPolicy(params, function(err, data) { diff --git a/docs/sdks/js/example-list-buckets.js b/docs/sdks/js/example-list.js similarity index 56% rename from docs/sdks/js/example-list-buckets.js rename to docs/sdks/js/example-list.js index ab34680d..cf22677e 100644 --- a/docs/sdks/js/example-list-buckets.js +++ b/docs/sdks/js/example-list.js @@ -3,11 +3,11 @@ var AWS = require('aws-sdk'); var config = { - accessKeyId: "YOUR_MINIO_ACCESS_ID", - secretAccessKey: "YOUR_MINIO_SECRET_KEY", + accessKeyId: "MINIO_ACCESS_ID", + secretAccessKey: "MINIO_SECRET_ID", endpoint: "localhost:9000", region: "", - sslEnabled: false + sslEnabled: false, }; AWS.config.update(config); @@ -20,3 +20,13 @@ s3.listBuckets(function(err, data) { console.log(data); // successful response } }); + + +var params = { + Bucket: "your-bucket" +}; + +s3.listObjects(params, function(err, data) { + if (err) console.log(err); + else console.log(data); +}); diff --git a/docs/sdks/js/javascript.md b/docs/sdks/js/javascript.md index faae2cdc..780bd1c0 100644 --- a/docs/sdks/js/javascript.md +++ b/docs/sdks/js/javascript.md @@ -8,17 +8,19 @@ npm install aws-sdk ``` -### Example ``GetService`` +### Example ``GetService`` and ``ListObjects`` ``` +'use strict' + var AWS = require('aws-sdk'); var config = { - accessKeyId: "YOUR_MINIO_ACCESS_ID", - secretAccessKey: "YOUR_MINIO_SECRET_KEY", + accessKeyId: "MINIO_ACCESS_ID", + secretAccessKey: "MINIO_SECRET_ID", endpoint: "localhost:9000", region: "", - sslEnabled: false + sslEnabled: false, }; AWS.config.update(config); @@ -31,13 +33,25 @@ s3.listBuckets(function(err, data) { console.log(data); // successful response } }); + + +var params = { + Bucket: "your-bucket" +}; + +s3.listObjects(params, function(err, data) { + if (err) console.log(err); + else console.log(data); +}); ``` -Grab it here [example-list-buckets.js](https://github.com/Minio-io/mc/blob/master/docs/sdks/js/example-list-buckets.js) +Grab it here [example-list.js](https://github.com/Minio-io/mc/blob/master/docs/sdks/js/example-list.js) -### Example ``BucketPolicy`` +### Example ``GetBucketPolicy`` and ``PutBucketPolicy`` ``` +'use strict' + var AWS = require('aws-sdk'); var config = { @@ -46,7 +60,6 @@ var config = { endpoint: "localhost:9000", region: "", sslEnabled: false, - s3ForcePathStyle: true }; AWS.config.update(config); @@ -57,12 +70,12 @@ var statement = { Sid: "ExampleStatemenent1", Effect: "Allow", Principal: { - AWS: "minio::Account-Id:user/Dave" + AWS: "minio::1111111:murphy" }, Action: [ - "s3.ListBucket", - "s3.GetObject", - "s3.PutObject", + "s3:ListBucket", + "s3:GetObject", + "s3:PutObject", ], Resource: [ "minio:::examplebucket" @@ -75,7 +88,7 @@ var policy = { } var params = { - Bucket: 'new-bucket', + Bucket: 'newbucket', Policy: JSON.stringify(policy), } @@ -88,7 +101,7 @@ s3.putBucketPolicy(params, function(err, data) { }); var params = { - Bucket: 'new-bucket' + Bucket: 'newbucket' }; s3.getBucketPolicy(params, function(err, data) { @@ -98,7 +111,6 @@ s3.getBucketPolicy(params, function(err, data) { console.log(data); } }); - ``` Grab it here [example-bucket-policy.js](https://github.com/Minio-io/mc/blob/master/docs/sdks/js/example-bucket-policy.js) diff --git a/docs/sdks/ruby/example-list-buckets.rb b/docs/sdks/ruby/example-list-buckets.rb index 7bf68717..0497ec27 100644 --- a/docs/sdks/ruby/example-list-buckets.rb +++ b/docs/sdks/ruby/example-list-buckets.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require 'aws-sdk' -s3 = Aws::S3::Client.new(endpoint: "http://127.0.0.1:9000/", +s3 = Aws::S3::Client.new(endpoint: "http://localhost:9000/", require_https_for_sse_cpk: false, region: "minio") resp = s3.list_buckets