From 5c22c34d653f2f04936910f80c397d6da7412df7 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 24 Nov 2014 15:38:45 -0500 Subject: [PATCH 1/3] Delete demo keys, update demos to use same environment vars as regressions. --- gcloud/datastore/demo/__init__.py | 10 +++++----- gcloud/datastore/demo/demo.key | Bin 1732 -> 0 bytes gcloud/storage/demo/__init__.py | 9 ++++----- gcloud/storage/demo/demo.key | Bin 1732 -> 0 bytes 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 gcloud/datastore/demo/demo.key delete mode 100644 gcloud/storage/demo/demo.key diff --git a/gcloud/datastore/demo/__init__.py b/gcloud/datastore/demo/__init__.py index 2f019fa5f160..c5ef27b92113 100644 --- a/gcloud/datastore/demo/__init__.py +++ b/gcloud/datastore/demo/__init__.py @@ -4,11 +4,11 @@ __all__ = ['get_dataset', 'CLIENT_EMAIL', 'DATASET_ID', 'PRIVATE_KEY_PATH'] -CLIENT_EMAIL = ('754762820716-gimou6egs2hq1rli7el2t621a1b04t9i' - '@developer.gserviceaccount.com') -DATASET_ID = 'gcloud-datastore-demo' -PRIVATE_KEY_PATH = os.path.join(os.path.dirname(__file__), 'demo.key') + +DATASET_ID = os.getenv('GCLOUD_TESTS_DATASET_ID') +CLIENT_EMAIL = os.getenv('GCLOUD_TESTS_CLIENT_EMAIL') +KEY_FILENAME = os.getenv('GCLOUD_TESTS_KEY_FILE') def get_dataset(): # pragma NO COVER - return datastore.get_dataset(DATASET_ID, CLIENT_EMAIL, PRIVATE_KEY_PATH) + return datastore.get_dataset(DATASET_ID, CLIENT_EMAIL, KEY_FILENAME) diff --git a/gcloud/datastore/demo/demo.key b/gcloud/datastore/demo/demo.key deleted file mode 100644 index 4fc3fe0a20d0cd7a63b34858e0f23d326527f9e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmY+Dc{tRGAIHCD#*8y$A~!iQD#jdcjXO$>V_MNrgLFtD4dv?hoiR4!TEt?>(&Q*x zOOBag9WhDdTFY*mW@uV>L&|M_dY<2J_t`(*&*ypG@Av2P*XM->;q4F!C>n&{hD)0; z+!?F#5(tSh5FQQ#;TL!95Htui{#OK5gMrX}ySCD<Qk#Lxuqbx0F3CmO6Jj#egj>gCRau{a}E zgZ}3nZx(;UmWzK2RepU?%e6MU;t!ryi({(xRQm-3R3s&_tY)bN;V?AkmvAJ}G|us-?@Y7ZNzHUzKB8h@ z`$B~C!dq00_e9c4O38r2+Y048wdVakEIcbxZH~iW#VjiTU)33VMC)T)Q2V#P}?wbA_X zLaz7Yz=wtS9_#ceTtY1Wwa>5VO4v1o$@UEjT`20FQ=KLM=oy)xz1G;DO|yQ@w7X)X zndqu2jFhrx9`_jD`z7P1-Cg4+f@S8_zKBTwj97bhj%2Vxw-f3wXN(@zN6>HXj@JMC z!=;htD%wckIuH$92B-i9hygAD;k&wp*88Wl&m0NcOS&9!LDw8>jkd;GSy|!Gc@5FF@d50r}**v~n-PPRT69*J!ipEG;geZSE@|cR&b# z{tOUcWc70zebt3uJQdpXekMy%TT|}Xom&KjV~~Yo)@nPkqQZ_eqYvd1y7$Xf9B!WZ z){j}NUoqNre^j85W`l^#-J(xVoP&!?`zYff{w=uJW?6{T!dR=#=~tNe#)te|0cU@! z+vq3uI(tsW>EyKixUh&f#XN_kgCF|@lmd*{9ak)XGMWdSrFv^){4ITjW3cS{jdm`# z^9w7emQj#L_FCl37fx^GwRr~r5`dm7q7jylxS)x+fIc>S8q@2Lv(+7^0($t{poS$r z0N<6h87PJvG|TT%l!tfeDuz|~t-HxNETsq}C--X2fA$Q*Z)vXBG*eODRBqekV4Zg+ zzvE{WscTT?tjwjAQ&}hOE?wBB_W(s9R6dFxx=*-~Fv~%5rt`#DDhS`*pO$=TUtg!c1yj6+XD? zkwZ7F_w$m!nk&;+iFJ$JFkrArTNbe$sTtcAk$?((>@GUcDkOL?kZ? z9|Ss^-^RNTU0j=x5v=p+8BzG@=u2kvaX`_Cb3%0+By&FK){Pms=_kZ|UHCJD3O$m@ zEA&tqL4wA5Gw1eT$V`*OWS@D6Xz#2INcLs#1U>zM_72r^Y*y!O0L!OJL0T_Qp3Dt4H>9g?W^z58+BK|DNZNTI2PuB3j=G z91Qoa||+emEpCsV}dvSiLpZxktyx>DB2@;L~$Td6r#l-su|K!3()p+_%VC zXnV9CS{g2SXb%*kE(ySp(XdqU3uTV{IQMgW(Tu#x=^POohBV5*7IuBdw6V$NAeA?K NAnRp!QOj3E{tJHT8chHI diff --git a/gcloud/storage/demo/__init__.py b/gcloud/storage/demo/__init__.py index 5e896f66a934..dffb5bbbff6f 100644 --- a/gcloud/storage/demo/__init__.py +++ b/gcloud/storage/demo/__init__.py @@ -4,11 +4,10 @@ __all__ = ['get_connection', 'CLIENT_EMAIL', 'PRIVATE_KEY_PATH', 'PROJECT'] -CLIENT_EMAIL = ('606734090113-6ink7iugcv89da9sru7lii8bs3i0obqg@' - 'developer.gserviceaccount.com') -PRIVATE_KEY_PATH = os.path.join(os.path.dirname(__file__), 'demo.key') -PROJECT = 'gcloud-storage-demo' +PROJECT_ID = os.getenv('GCLOUD_TESTS_PROJECT_ID') +CLIENT_EMAIL = os.getenv('GCLOUD_TESTS_CLIENT_EMAIL') +KEY_FILENAME = os.getenv('GCLOUD_TESTS_KEY_FILE') def get_connection(): # pragma NO COVER. - return storage.get_connection(PROJECT, CLIENT_EMAIL, PRIVATE_KEY_PATH) + return storage.get_connection(PROJECT_ID, CLIENT_EMAIL, KEY_FILENAME) diff --git a/gcloud/storage/demo/demo.key b/gcloud/storage/demo/demo.key deleted file mode 100644 index 434d999f6b6d4cb37efdcb96335c2d0b5f2fd83a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmY+DdpHvcAIEnyHkVh-wJ?;J+veJ)T5gleri<;}j%%{9mU7yZTgS{2O1+18lpLJG z+=V2ULTGY`Q|z2mjmh%*^{esGRbJZ5a;5{MN(xm2o09gcD+Qiw)toJAe0ZHYC#TkpXbD02U#V1Bp$##E}} z=QB%>KMh*S>#16wzLB=jY`t~h4{c}J$XnWFA2jBhmrzLv@+mLDAdo#0N#ghJbNpO> z(sS8nwpQ#H|5_DJHb{Bbr_>47L3%FYY-Pvx?Yk%1Z&_tE`(d>EnnRuS&}_!qev5Kc z^dl97>%658#+W&APEE4P6m5?DgkAFMau&a9B>Y5b)}y|65=R@Kko3;&(I(0Ue@@s) z+bEPUVS->mYjqK0Gs%x4CpOVE*D5OKX&sE|Eul9sV$D~!zp1ZXrZd<*Ob{SUV7Y>0 zavS3BcyM#EE47UUGOsrMsGtCqSQp2gx1cqmul!?v4K*sd$siW%6?L@_#{7nQ7J1Y)<@SoYCh3D#TVs$fR>uhuX&IR5u$=q)kn&%^ z%hKFvr_n~wM=&5lVcPC~Sn6^|+N^qhu}7D3Q*3r?QBH;#l3m|8lPx0B5hl^oRyMw& zXhZ3}yxaLK3qs8`{<;Z+64i}M5(_Jzck6ZCQXMLGDrtT3AXJxru9x+N{XV$VIZj$r z$lfaERfN|L7FmbLUK4LUzM4@VFG|ilQGOc2e!-jeAN~Z<6De=_gm!CJv1<~c3J+b$ zX6v0B)JHCSOeL1=lb1(MX9?*+2YZd)p;C-yvYaJl@NcIM6+|daHW22=u*7_$4T0-h z5?8}!%Vg$PH@S*?Wrl#DZx3p;I{H%Kp(XT>OTrD3k2*8nc>ANVvvai=a~y5__lLs} z7)^ZyAPR5^zyw?doB?nEbO38tv1r48N*WjhM9q&GNk?LAu^1b)y{&_t9mZi72;09) z^3Xyac>k`21OWlNL+76a_%A@9UjYH54$t`P369ZzN<9;IQs9yW^&I&M2$u&MqYRG^ zEl3W4`v$JNy)bgKksKb)6)a3}j(lI{)|BzP@<_~-VEZ-y0-)G2dbD8Sf;1YHM$JXd zmUMim)6#v?unRCUzKg*!!jji1UFMRC| z;D7zA4XOzNuWrww1i!HCR=^2Jb>!!?k9G|KSmCK=rLgrWJVPr41smgi zldS>v864}Q`RfO4Qrts$8AaRg`AnH_zO7LiA2Z0e%7sb0aj2!OoPG!R#U8aTP5_jg zbj2wSMT1 zF6Onot1lQSHlj-1QCn{3@v29wEb0>TsbOaMie@xl@JnLhK-C*DUq?gtb%jNuRKABm z6uH=i%QsTAp3}BZjOqd0tgwW-Cr-NO4)+W8&qV%+%2fx4uoDn{oz z0cMOvQZq-jO=A}6hhb0tW0HQz6j-^;dhSLRMm`HWQgz*hhQC6t=$J~r;5{#z7YaGU z&vCN;ICti>cuv}l*XPuf%F*agB!e91{-8s@El?uuBD@12`1Rsbe&#$t%;`!M=A5jk z5q;j-)~_$Z$?27F)+^YE^>PN=Gu2YhM%Jd L{wX}#S492 Date: Mon, 24 Nov 2014 16:41:25 -0500 Subject: [PATCH 2/3] Fix names exported by '__all__'. --- gcloud/datastore/demo/__init__.py | 2 +- gcloud/storage/demo/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcloud/datastore/demo/__init__.py b/gcloud/datastore/demo/__init__.py index c5ef27b92113..5c0fe9497467 100644 --- a/gcloud/datastore/demo/__init__.py +++ b/gcloud/datastore/demo/__init__.py @@ -2,7 +2,7 @@ import os from gcloud import datastore -__all__ = ['get_dataset', 'CLIENT_EMAIL', 'DATASET_ID', 'PRIVATE_KEY_PATH'] +__all__ = ['get_dataset', 'CLIENT_EMAIL', 'DATASET_ID', 'KEY_FILENAME'] DATASET_ID = os.getenv('GCLOUD_TESTS_DATASET_ID') diff --git a/gcloud/storage/demo/__init__.py b/gcloud/storage/demo/__init__.py index dffb5bbbff6f..937aa7f23c1e 100644 --- a/gcloud/storage/demo/__init__.py +++ b/gcloud/storage/demo/__init__.py @@ -2,7 +2,7 @@ import os from gcloud import storage -__all__ = ['get_connection', 'CLIENT_EMAIL', 'PRIVATE_KEY_PATH', 'PROJECT'] +__all__ = ['get_connection', 'CLIENT_EMAIL', 'KEY_FILENAME', 'PROJECT_ID'] PROJECT_ID = os.getenv('GCLOUD_TESTS_PROJECT_ID') CLIENT_EMAIL = os.getenv('GCLOUD_TESTS_CLIENT_EMAIL') From 73885a3181797345e4ee53b9c43a51f18ecc5c9a Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 24 Nov 2014 16:41:50 -0500 Subject: [PATCH 3/3] Update docs on running demo to explain environment variables. --- docs/datastore-quickstart.rst | 18 ++++++++++++++++++ docs/storage-quickstart.rst | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/docs/datastore-quickstart.rst b/docs/datastore-quickstart.rst index 83236f7854a3..733a42930a8a 100644 --- a/docs/datastore-quickstart.rst +++ b/docs/datastore-quickstart.rst @@ -21,6 +21,24 @@ You can install the library quickly with ``pip``:: $ pip install gcloud +Run the demo +------------ + +In order to run the demo, you need to have registred an actual ``gcloud`` +project and so you'll need to provide some environment variables to facilitate +authentication to your project: + + - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g. + bamboo-shift-455). + - ``GCLOUD_TESTS_DATASET_ID``: The name of the dataset your tests connect to. + This is typically the same as ``GCLOUD_TESTS_PROJECT_ID``. + - ``GCLOUD_TESTS_CLIENT_EMAIL``: The email for the service account you're + authenticating with + - ``GCLOUD_TESTS_KEY_FILE``: The path to an encrypted key file. + See private key + `docs `__ + for explanation on how to get a private key. + Run the `example script `_ included in the package:: diff --git a/docs/storage-quickstart.rst b/docs/storage-quickstart.rst index a0d8de424419..28067bc60160 100644 --- a/docs/storage-quickstart.rst +++ b/docs/storage-quickstart.rst @@ -11,6 +11,24 @@ You can install the library quickly with ``pip``:: $ pip install gcloud +Run the demo +------------ + +In order to run the demo, you need to have registred an actual ``gcloud`` +project and so you'll need to provide some environment variables to facilitate +authentication to your project: + + - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g. + bamboo-shift-455). + - ``GCLOUD_TESTS_DATASET_ID``: The name of the dataset your tests connect to. + This is typically the same as ``GCLOUD_TESTS_PROJECT_ID``. + - ``GCLOUD_TESTS_CLIENT_EMAIL``: The email for the service account you're + authenticating with + - ``GCLOUD_TESTS_KEY_FILE``: The path to an encrypted key file. + See private key + `docs `__ + for explanation on how to get a private key. + Run the `example script `_ included in the package::