paasta-tools 1.21.3__tar.gz → 1.21.4__tar.gz

{paasta_tools-1.21.3/paasta_tools.egg-info → paasta_tools-1.21.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.21.3
+Version: 1.21.4
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com
@@ -58,7 +58,7 @@ Requires-Dist: requests-cache>=0.4.10
 Requires-Dist: retry
 Requires-Dist: ruamel.yaml
 Requires-Dist: sensu-plugin
-Requires-Dist: service-configuration-lib>=3.2.0
+Requires-Dist: service-configuration-lib>=3.3.2
 Requires-Dist: signalfx
 Requires-Dist: slackclient>=1.2.1
 Requires-Dist: sticht>=1.1.0

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.21.3"
+__version__ = "1.21.4"

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/cli/authentication.py

@@ -12,63 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from functools import lru_cache
-
-from botocore.credentials import InstanceMetadataFetcher
-from botocore.credentials import InstanceMetadataProvider
+from typing import Optional
 
 from paasta_tools.utils import load_system_paasta_config
 
 
 try:
-    from vault_tools.paasta_secret import get_client as get_vault_client
-    from vault_tools.paasta_secret import get_vault_url
-    from vault_tools.paasta_secret import get_vault_ca
+    from vault_tools.oidc import get_instance_oidc_identity_token
     from okta_auth import get_and_cache_jwt_default
 except ImportError:
 
-    def get_vault_client(url: str, capath: str) -> None:
-        pass
-
-    def get_vault_url(ecosystem: str) -> str:
-        return ""
-
-    def get_vault_ca(ecosystem: str) -> str:
+    def get_instance_oidc_identity_token(
+        role: str, ecosystem: Optional[str] = None
+    ) -> str:
         return ""
 
     def get_and_cache_jwt_default(client_id: str) -> str:
         return ""
 
 
-def get_current_ecosystem() -> str:
-    """Get current ecosystem from host configs, defaults to dev if no config is found"""
-    try:
-        with open("/nail/etc/ecosystem") as f:
-            return f.read().strip()
-    except IOError:
-        pass
-    return "devc"
-
-
 @lru_cache(maxsize=1)
 def get_service_auth_token() -> str:
     """Uses instance profile to authenticate with Vault and generate token for service authentication"""
-    ecosystem = get_current_ecosystem()
-    vault_client = get_vault_client(get_vault_url(ecosystem), get_vault_ca(ecosystem))
     vault_role = load_system_paasta_config().get_service_auth_vault_role()
-    metadata_provider = InstanceMetadataProvider(
-        iam_role_fetcher=InstanceMetadataFetcher(),
-    )
-    instance_credentials = metadata_provider.load().get_frozen_credentials()
-    vault_client.auth.aws.iam_login(
-        instance_credentials.access_key,
-        instance_credentials.secret_key,
-        instance_credentials.token,
-        mount_point="aws-iam",
-        role=vault_role,
-        use_token=True,
-    )
-    response = vault_client.secrets.identity.generate_signed_id_token(name=vault_role)
-    return response["data"]["token"]
+    return get_instance_oidc_identity_token(vault_role)
 
 
 def get_sso_auth_token(paasta_apis: bool = False) -> str:

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/cli/cmds/logs.py

@@ -178,7 +178,7 @@ def add_subparser(subparsers) -> None:
         help=(
             "The time to get logs up to. "
             'This can be an ISO-8601 timestamp or a human readable duration parsable by pytimeparse such as "5m", "1d3h" etc. '
-            "Incompatiable with --line-offset and --lines. "
+            "Incompatible with --line-offset and --lines. "
             "Defaults to now."
         ),
     )
@@ -190,7 +190,7 @@ def add_subparser(subparsers) -> None:
         help=(
             "The number of lines to retrieve from the specified offset. "
             'May optionally be prefixed with a "+" or "-" to specify which direction from the offset. '
-            "Incompatiable with --from and --to. "
+            "Incompatible with --from and --to. "
             'Defaults to "-100".'
         ),
         type=int,
@@ -204,7 +204,7 @@ def add_subparser(subparsers) -> None:
             "For example, --line-offset 1 would be the first line. "
             "Paired with --lines, --line-offset +100 would give you the first 100 lines of logs. "
             "Some logging backends may not support line offsetting by time or lines. "
-            "Incompatiable with --from and --to. "
+            "Incompatible with --from and --to. "
             "Defaults to the latest line's offset."
         ),
         type=int,
@@ -804,7 +804,7 @@ class ScribeLogReader(LogReader):
                     # sure all the tailers are still running.
                     running_processes = [tt.is_alive() for tt in spawned_processes]
                     if not running_processes or not all(running_processes):
-                        log.warn(
+                        log.warning(
                             "Quitting because I expected %d log tailers to be alive but only %d are alive."
                             % (len(spawned_processes), running_processes.count(True))
                         )
@@ -819,12 +819,12 @@ class ScribeLogReader(LogReader):
                     # This extra nested catch is because it's pretty easy to be in
                     # the above try block when the user hits Ctrl-C which otherwise
                     # dumps a stack trace.
-                    log.warn("Terminating.")
+                    log.warning("Terminating.")
                     break
             except KeyboardInterrupt:
                 # Die peacefully rather than printing N threads worth of stack
                 # traces.
-                log.warn("Terminating.")
+                log.warning("Terminating.")
                 break
 
     def print_logs_by_time(
@@ -1019,7 +1019,7 @@ class ScribeLogReader(LogReader):
             tzinfo=pytz.utc
         ) - datetime.timedelta(hours=4)
         if end_time > warning_end_time:
-            log.warn("Recent logs might be incomplete. Consider tailing instead.")
+            log.warning("Recent logs might be incomplete. Consider tailing instead.")
 
         # scribereader, sadly, is not based on UTC timestamps. It uses YST
         # dates instead.

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/cli/schemas/service_schema.json

@@ -10,7 +10,10 @@
             "type": "string"
         },
         "git_url": {
-            "type": "string",
+            "type": [
+                "string",
+                "null"
+            ],
             "pattern": "^git@github.yelpcorp.com:[-a-z]+/[-_a-z0-9]+(\\.git)?$",
             "$comment": "this is obviously very tied to how we name repos at Yelp"
         },

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/generate_deployments_for_service.py

@@ -130,6 +130,10 @@ def get_deploy_group_mappings(
     v2_mappings: V2_Mappings = {"deployments": {}, "controls": {}}
     git_url = get_git_url(service=service, soa_dir=soa_dir)
 
+    # Some pseudo-services like toolboxes explicitly have no git_url, and therefore no deployments
+    if git_url is None:
+        return mappings, v2_mappings
+
     # Most of the time of this function is in two parts:
     # 1. getting remote refs from git. (Mostly IO, just waiting for git to get back to us.)
     # 2. loading instance configs. (Mostly CPU, copy.deepcopying yaml over and over again)

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/setup_istio_mesh.py

@@ -103,7 +103,7 @@ def load_smartstack_namespaces(soa_dir: str = DEFAULT_SOA_DIR) -> Mapping:
                 for (ns, details) in svc_namespaces.items():
                     namespaces[f"{dir}.{ns}"] = details
         except Exception as err:
-            log.warn(f"Failed to load namespaces for {dir}: {err}")
+            log.warning(f"Failed to load namespaces for {dir}: {err}")
 
     return namespaces
 

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/smartstack_tools.py

@@ -473,7 +473,7 @@ def get_service_discovery_providers(
         elif name == "envoy":
             providers.append(EnvoyServiceDiscovery(system_paasta_config))
         else:
-            log.warn("unknown provider")
+            log.warning("unknown provider")
     return providers
 
 
@@ -530,7 +530,7 @@ class BaseReplicationChecker(ReplicationChecker):
                         )
                         break
                     except Exception as e:
-                        log.warn(
+                        log.warning(
                             f"Error while getting replication info for {location} from {hostname}: {e}"
                         )
                         if hostname == hostnames[-1]:

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools/spark_tools.py

@@ -133,7 +133,7 @@ def setup_volume_mounts(volumes: List[DockerVolume]) -> Dict[str, str]:
         )
 
         if host_path in seen_paths:
-            log.warn(f"Skipping {host_path} - already added a binding for it.")
+            log.warning(f"Skipping {host_path} - already added a binding for it.")
             continue
         seen_paths.add(host_path)
 
@@ -209,7 +209,7 @@ def auto_add_timeout_for_spark_job(
             f"'timeout' could not be added to spark command: '{cmd}' due to error '{e}'. "
             "Please report to #spark."
         )
-        log.warn(err_msg)
+        log.warning(err_msg)
         print(PaastaColors.red(err_msg))
     return cmd
 

{paasta_tools-1.21.3 → paasta_tools-1.21.4/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.21.3
+Version: 1.21.4
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com
@@ -58,7 +58,7 @@ Requires-Dist: requests-cache>=0.4.10
 Requires-Dist: retry
 Requires-Dist: ruamel.yaml
 Requires-Dist: sensu-plugin
-Requires-Dist: service-configuration-lib>=3.2.0
+Requires-Dist: service-configuration-lib>=3.3.2
 Requires-Dist: signalfx
 Requires-Dist: slackclient>=1.2.1
 Requires-Dist: sticht>=1.1.0

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/paasta_tools.egg-info/requires.txt

@@ -49,7 +49,7 @@ requests-cache>=0.4.10
 retry
 ruamel.yaml
 sensu-plugin
-service-configuration-lib>=3.2.0
+service-configuration-lib>=3.3.2
 signalfx
 slackclient>=1.2.1
 sticht>=1.1.0

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/requirements-minimal.txt

@@ -56,7 +56,7 @@ requests-cache >= 0.4.10
 retry
 ruamel.yaml
 sensu-plugin
-service-configuration-lib >= 3.2.0
+service-configuration-lib >= 3.3.2
 signalfx
 slackclient >= 1.2.1
 sticht >= 1.1.0

{paasta_tools-1.21.3 → paasta_tools-1.21.4}/tests/test_tron_tools.py

@@ -1357,7 +1357,6 @@ class TestTronTools:
             "--conf spark.dynamicAllocation.shuffleTracking.enabled=true "
             "--conf spark.dynamicAllocation.executorAllocationRatio=0.8 "
             "--conf spark.dynamicAllocation.cachedExecutorIdleTimeout=1500s "
-            "--conf spark.dynamicAllocation.minExecutors=0 "
             "--conf spark.dynamicAllocation.maxExecutors=2 "
             "--conf spark.ui.prometheus.enabled=true "
             "--conf spark.metrics.conf.*.sink.prometheusServlet.class=org.apache.spark.metrics.sink.PrometheusServlet "