Skip to content

Commit dc9fb2a

Browse files
authored
Adds KMS integration samples for Google Cloud Storage (GoogleCloudPlatform#632)
1 parent c5f9201 commit dc9fb2a

File tree

11 files changed

+724
-157
lines changed

11 files changed

+724
-157
lines changed

.kokoro/secrets-example.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ export GOOGLE_PUBSUB_TOPIC=php-example-topic
8989
export GOOGLE_SPANNER_INSTANCE_ID=
9090
export GOOGLE_SPANNER_DATABASE_ID=test-database
9191

92+
# Storage
93+
export GOOGLE_STORAGE_OBJECT=storage/test_data.csv
94+
export GOOGLE_STORAGE_KMS_KEYNAME=projects/$GOOGLE_PROJECT_ID/locations/us/keyRings/$GOOGLE_KMS_KEYRING/cryptoKeys/storage-bucket
95+
9296
# Tasks
9397
export CLOUD_TASKS_APPENGINE_QUEUE=
9498
export CLOUD_TASKS_LOCATION=

appengine/php72/storage/test/DeployTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static function beforeDeploy()
5454

5555
$appYamlContents = file_get_contents('app.yaml');
5656
$appYaml = Yaml::parse($appYamlContents);
57-
$appYaml['env_variables']['GOOGLE_STORAGE_BUCKET'] = $bucketName;
57+
$appYaml['env_variables']['GOOGLE_STORAGE_BUCKET'] = $bucketName . '/storage';
5858
file_put_contents('app.yaml', Yaml::dump($appYaml));
5959
}
6060

storage/composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"google/cloud-storage": "^1.2",
3+
"google/cloud-storage": "^1.5.2",
44
"paragonie/random_compat": "^2.0",
55
"symfony/console": " ^3.0"
66
},
@@ -18,8 +18,12 @@
1818
"src/delete_bucket_default_acl.php",
1919
"src/delete_object.php",
2020
"src/delete_object_acl.php",
21+
"src/disable_requester_pays.php",
2122
"src/download_encrypted_object.php",
23+
"src/download_file_requester_pays.php",
2224
"src/download_object.php",
25+
"src/enable_default_kms_key.php",
26+
"src/enable_requester_pays.php",
2327
"src/object_metadata.php",
2428
"src/generate_encryption_key.php",
2529
"src/get_bucket_acl.php",
@@ -29,6 +33,7 @@
2933
"src/get_bucket_labels.php",
3034
"src/get_object_acl.php",
3135
"src/get_object_acl_for_entity.php",
36+
"src/get_requester_pays_status.php",
3237
"src/list_buckets.php",
3338
"src/list_objects.php",
3439
"src/list_objects_with_prefix.php",
@@ -39,14 +44,11 @@
3944
"src/rotate_encryption_key.php",
4045
"src/upload_encrypted_object.php",
4146
"src/upload_object.php",
42-
"src/view_bucket_iam_members.php",
43-
"src/enable_requester_pays.php",
44-
"src/disable_requester_pays.php",
45-
"src/get_requester_pays_status.php",
46-
"src/download_file_requester_pays.php"
47+
"src/upload_with_kms_key.php",
48+
"src/view_bucket_iam_members.php"
4749
]
4850
},
4951
"require-dev": {
50-
"phpunit/phpunit": "~4"
52+
"phpunit/phpunit": "~5"
5153
}
5254
}

0 commit comments

Comments
 (0)