Changeset 285900 in webkit

Timestamp:

Nov 16, 2021, 4:56:19 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Load secrets in kubernetes
​https://bugs.webkit.org/show_bug.cgi?id=233158
<rdar://problem/85433499>

Reviewed by Dewei Zhu.

• Tools/Scripts/libraries/webkitcorepy/setup.py: Bump version.
• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/init.py: Bump version, export Environment.
• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:

(credentials): Use Environment instead of os.environ.

• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/environment.py: Added.

(Environment):
(Environment.instance): Construct a shared Environmant intance.
(Environment.init):
(Environment.load): Load secrets in file directory.
(Environment.get): Check environment variable and then secret store.
(Environment.getitem):
(Environment.setitem):
(Environment.keys): Iterate through secret store and environment variables.
(Environment.values): Ditto.
(Environment.items): Ditto.

• Tools/Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py: Added.

(TestEnvironment):
(TestEnvironment.test_basic):
(TestEnvironment.test_scoped):
(TestEnvironment.test_list):

Canonical link: ​https://commits.webkit.org/244316@main

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (2 diffs)
• Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py (modified) (2 diffs)
• Scripts/libraries/webkitcorepy/webkitcorepy/environment.py (added)
• Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Load secrets in kubernetes
+        https://bugs.webkit.org/show_bug.cgi?id=233158
+        <rdar://problem/85433499>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version, export Environment.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:
+        (credentials): Use Environment instead of os.environ.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/environment.py: Added.
+        (Environment):
+        (Environment.instance): Construct a shared Environmant intance.
+        (Environment.__init__):
+        (Environment.load): Load secrets in file directory.
+        (Environment.get): Check environment variable and then secret store.
+        (Environment.__getitem__):
+        (Environment.__setitem__):
+        (Environment.keys): Iterate through secret store and environment variables.
+        (Environment.values): Ditto.
+        (Environment.items): Ditto.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/tests/environment_unittest.py: Added.
+        (TestEnvironment):
+        (TestEnvironment.test_basic):
+        (TestEnvironment.test_scoped):
+        (TestEnvironment.test_list):
+
 2021-11-12  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/setup.py

@@ -31 +31 @@
 setup(
     name='webkitcorepy',
-    version='0.11.4',
+    version='0.12.0',
     description='Library containing various Python support classes and functions.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -37 +37 @@
 from webkitcorepy.task_pool import TaskPool
 from webkitcorepy.terminal import Terminal
+from webkitcorepy.environment import Environment
 from webkitcorepy.credentials import credentials
 from webkitcorepy.measure_time import MeasureTime
@@ -44 +45 @@
 from webkitcorepy.file_lock import FileLock
 
-version = Version(0, 11, 4)
+version = Version(0, 12, 0)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py

@@ -21 +21 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
 import getpass
 import sys
 
 from subprocess import CalledProcessError
-from webkitcorepy import OutputCapture, Terminal
+from webkitcorepy import Environment, OutputCapture, Terminal
 
 _cache = dict()
@@ -38 +37 @@
         return _cache.get(name)
 
-    username = os.environ.get('{}_USERNAME'.format(name.upper()))
-    key = os.environ.get('{}_{}'.format(name.upper(), key_name.upper()))
+    username = Environment.instance().get('{}_USERNAME'.format(name.upper()))
+    key = Environment.instance().get('{}_{}'.format(name.upper(), key_name.upper()))
 
     if username and key: