Releasing version 3.15.0

Co-authored-by: Hamada Ibrahim <[email protected]>
Co-authored-by: Harsh Kumar <[email protected]>
Co-authored-by: Kanvi Pasricha <[email protected]>
Co-authored-by: Alex Le <[email protected]>
Co-authored-by: Nupur Gupta <[email protected]>
Co-authored-by: Karthik Kamath <[email protected]>

Author: 7 people

CHANGELOG.rst

@@ -6,6 +6,44 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`__.
 
+3.15.0 - 2022-08-16
+--------------------
+Added
+~~~~~
+* Support for debug reports and analysis in Service Mesh service
+
+  * ``oci service-mesh debug report``
+
+* Support for Logging Analytics as a target for Streaming Source feature for Service Connector Hub in the Logging service
+
+  * ``oci logging analytics target``
+
+* Support for streaming Application logs to Logging Service in the Data Flow Service
+
+  * ``oci data-flow run create --application-log-config``
+  * ``oci data-flow application create --application-log-config``
+  * ``oci data-flow application update --application-log-config``
+  * ``oci data-flow run submit --application-log-config``
+
+* Support for the below commands in the Cloud Guard service
+
+  * ``oci cloud-guard data-source``
+  * ``oci cloud-guard detector-recipe-detector-rule``
+  * ``oci cloud-guard problem list-problem-entities``
+  * ``oci cloud-guard work-request``
+  * ``oci cloud-guard work-request-error``
+  * ``oci cloud-guard work-request-log-entry``
+
+Changed
+~~~~~
+* The parameter --source-detector-recipe-id is now optional in the below command in the Cloud Guard service
+
+  * ``oci cloud-guard detector-recipe create``
+
+Fixed
+~~~~~
+* [BREAKING] The command ``oci logging-search search-result search-logs`` has been changed back to be ``oci logging-search search-logs``
+
 3.14.0 - 2022-08-09
 --------------------
 Added

requirements.txt

@@ -14,7 +14,7 @@ Jinja2==3.0.3
 jmespath==0.10.0
 ndg-httpsclient==0.4.2
 mock==2.0.0
-oci==2.78.0
+oci==2.79.0
 packaging==20.2
 pluggy==0.13.0
 py==1.10.0

services/cloud_guard/src/oci_cli_cloud_guard/generated/cloudguard_cli.py

@@ -174,6 +174,7 @@ def _create_and_write_cert(cert_file):
             f.write(ssl_cert)
         return cert.digest("md5")
 
+    @unittest.skip("skipped to prevent comment on tickets")
     def test_init_auth_valid_cert_fingerprint(self):
         # Mock only the fetch_cert() method of the cert_manager
         auth_spec = self._get_test_auth_spec(self._get_config_manager(), "1.2.3.4", 443)
@@ -186,6 +187,7 @@ def test_init_auth_valid_cert_fingerprint(self):
         self._test_init_auth(auth_spec, validate_cert_manager_calls=False, cert_fingerprint=cert_fingerprint)
         self._validate_init_auth(auth_spec)
 
+    @unittest.skip("skipped to prevent comment on tickets")
     def test_init_auth_invalid_cert_fingerprint(self):
         with self.assertRaises(exceptions.RequestException):
             # Mock only the fetch_cert() method of the cert_manager

services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py

@@ -0,0 +1,9 @@
+# coding: utf-8
+# Copyright (c) 2016, 2021, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+
+from services.loggingsearch.src.oci_cli_log_search.generated import logsearch_cli
+
+# oci loggingsearch search-result search-logs -> oci loggingsearch search-logs
+logsearch_cli.logging_search_root_group.commands.pop(logsearch_cli.search_result_group.name)
+logsearch_cli.logging_search_root_group.add_command(logsearch_cli.search_logs)

services/data_science/src/oci_cli_data_science/generated/datascience_cli.py

@@ -859,6 +859,7 @@ def create_service_connector_functions_target_details(ctx, from_json, wait_for_s
 This option is a JSON list with items of type TaskDetails.  For documentation on TaskDetails please see our API reference: https://docs.cloud.oracle.com/api/#/en/serviceconnector/20200909/datatypes/TaskDetails.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{\"bar-key\": \"value\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
+@cli_util.option('--target-log-source-identifier', help=u"""Identifier of the log source that you want to use for processing data received from the service connector source. Applies to `StreamingSource` only. Equivalent to `name` at [LogAnalyticsSource].""")
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
 @cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
 @cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request to see if it has reached the state defined by --wait-for-state. Defaults to 30 seconds.""")
@@ -867,7 +868,7 @@ def create_service_connector_functions_target_details(ctx, from_json, wait_for_s
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'source': {'module': 'sch', 'class': 'SourceDetails'}, 'tasks': {'module': 'sch', 'class': 'list[TaskDetails]'}, 'freeform-tags': {'module': 'sch', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'sch', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.wrap_exceptions
-def create_service_connector_logging_analytics_target_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, compartment_id, source, target_log_group_id, description, tasks, freeform_tags, defined_tags):
+def create_service_connector_logging_analytics_target_details(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, display_name, compartment_id, source, target_log_group_id, description, tasks, freeform_tags, defined_tags, target_log_source_identifier):
 
     kwargs = {}
     kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id'])
@@ -891,6 +892,9 @@ def create_service_connector_logging_analytics_target_details(ctx, from_json, wa
     if defined_tags is not None:
         _details['definedTags'] = cli_util.parse_json_parameter("defined_tags", defined_tags)
 
+    if target_log_source_identifier is not None:
+        _details['target']['logSourceIdentifier'] = target_log_source_identifier
+
     _details['target']['kind'] = 'loggingAnalytics'
 
     client = cli_util.build_client('sch', 'service_connector', ctx)
@@ -2166,6 +2170,7 @@ def update_service_connector_functions_target_details(ctx, from_json, force, wai
 @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{\"bar-key\": \"value\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP)
 @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""")
+@cli_util.option('--target-log-source-identifier', help=u"""Identifier of the log source that you want to use for processing data received from the service connector source. Applies to `StreamingSource` only. Equivalent to `name` at [LogAnalyticsSource].""")
 @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True)
 @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "IN_PROGRESS", "FAILED", "SUCCEEDED", "CANCELING", "CANCELED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""")
 @cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""")
@@ -2175,7 +2180,7 @@ def update_service_connector_functions_target_details(ctx, from_json, force, wai
 @click.pass_context
 @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'source': {'module': 'sch', 'class': 'SourceDetails'}, 'tasks': {'module': 'sch', 'class': 'list[TaskDetails]'}, 'freeform-tags': {'module': 'sch', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'sch', 'class': 'dict(str, dict(str, object))'}})
 @cli_util.wrap_exceptions
-def update_service_connector_logging_analytics_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_log_group_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match):
+def update_service_connector_logging_analytics_target_details(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, service_connector_id, target_log_group_id, display_name, description, source, tasks, freeform_tags, defined_tags, if_match, target_log_source_identifier):
 
     if isinstance(service_connector_id, six.string_types) and len(service_connector_id.strip()) == 0:
         raise click.UsageError('Parameter --service-connector-id cannot be whitespace or empty string')
@@ -2211,6 +2216,9 @@ def update_service_connector_logging_analytics_target_details(ctx, from_json, fo
     if defined_tags is not None:
         _details['definedTags'] = cli_util.parse_json_parameter("defined_tags", defined_tags)
 
+    if target_log_source_identifier is not None:
+        _details['target']['logSourceIdentifier'] = target_log_source_identifier
+
     _details['target']['kind'] = 'loggingAnalytics'
 
     client = cli_util.build_client('sch', 'service_connector', ctx)

services/dts/tests/unit/test_physical_appliance.py

@@ -0,0 +1,57 @@
+# coding: utf-8
+# Copyright (c) 2016, 2021, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+import os.path
+import sys
+
+import click
+from oci_cli import cli_util
+from oci_cli.aliasing import CommandGroupWithAlias
+
+from services.service_mesh.src.oci_cli_service_mesh.generated import servicemesh_cli
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.bundle_analyser import BundleAnalyser
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.report_orchestrator \
+    import ReportOrchestrator
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.utils.bundle_helper import BundleHelper
+
+
+@click.command(cli_util.override('service_mesh.debug_group.command_name', 'debug'), cls=CommandGroupWithAlias,
+               help="""Debug enables customers to troubleshoot service-mesh resources.""")
+@cli_util.help_option_group
+def debug_group():
+    pass
+
+
+# oci service-mesh debug
+servicemesh_cli.service_mesh_root_group.add_command(debug_group)
+
+
+# oci service-mesh debug report
+# oci service-mesh debug report --resource-id <ocid>
+# oci service-mesh debug report --resource-id <ocid> --k8s-context <path_to_config_file>
+@debug_group.command(name=cli_util.override('service_mesh.report.command_name', 'report'),
+                     help=u"""Generates report to troubleshoot Service Mesh resources and setup.""")
+@cli_util.option('--resource-id', required=False, help=u"""The [OCID] of the service-mesh resource.""")
+@cli_util.option('--kubeconfig', required=False, help=u"""The filepath of the config file containing the kubernetes config of the Kubernetes Cluster. If not specified default config file will be applied.""")
+@cli_util.option('--context', required=False, help=u"""Context to be used in the kube config file. If not specified, the current-context is used by default.""")
+@cli_util.option('--thread-pool-size', required=False, help=u"""The Size of thread pool to execute the command""")
+@cli_util.help_option
+@click.pass_context
+@cli_util.wrap_exceptions
+def generate_mesh(ctx, resource_id, kubeconfig, context, thread_pool_size):
+    try:
+        report_orchestrator = ReportOrchestrator(resource_id, kubeconfig, context, thread_pool_size)
+        result = report_orchestrator.build_report()
+        if result is not None:
+            click.echo(result, file=sys.stderr)
+        else:
+            click.echo('Report generation successful.', file=sys.stdout)
+            bundle_file_path = os.path.join(BundleHelper.get_home_directory(), BundleHelper.get_bundle_name())
+            # click.echo - Bundle file path
+            click.echo('\nBundle file path: {}'.format(bundle_file_path))
+            # call Analyser
+            bundle_analyzer = BundleAnalyser(bundle_file_path=bundle_file_path)
+            analyze = bundle_analyzer.analyze()
+    except Exception as e:
+        click.echo('Report generation unsuccessful. Some problem occurred during report generation. {}'.format(e),
+                   file=sys.stderr)

services/loggingsearch/src/oci_cli_log_search/log_search_cli_extended.py

@@ -0,0 +1,80 @@
+# coding: utf-8
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.aggregators.aggregation_orchestrator import \
+    AggregationOrchestrator, ReportData
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.event import Event, EventType, \
+    OperationType
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.task_orchestrator import TaskOrchestrator
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.task_request import TaskRequestType, \
+    TaskConfiguration, MeshReportTaskRequest, ResourceTaskRequest, PodTaskRequest, TaskRequest, VdbTaskRequest, \
+    IgdTaskRequest, NamespacesTaskRequest, FileTaskRequest, MeshResourcesTaskRequest, CommonTaskRequest, CsvTaskRequest, \
+    ObservabilityTaskRequest, ValidateCrdsTaskRequest, WebhooksTaskRequest
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.observability_worker import \
+    ObservabilityTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.webhooks_worker import WebhooksTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.utils.kubectl_command_helper import \
+    KubeCommandHelper
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.utils.summary import BasicPodSummary, \
+    MeshData, PodSummary, CustomResourceSummary, MeshResources
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.common_worker import CommonTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.csv_worker import CsvTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.file_worker import FileTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.igd_worker import IgdTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.mesh_report_worker import \
+    MeshReportTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.mesh_resources_worker import \
+    MeshResourcesTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.namespaces_worker import \
+    NamespacesTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.pod_worker import PodTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.resource_worker import \
+    ResourceTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.task_worker import MeshTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.vdb_worker import VdbTask
+from services.service_mesh.src.oci_cli_service_mesh.service_mesh_troubleshoot.tasks.validate_crds_worker import ValidateCrdsTask
+
+__all__ = ["AggregationOrchestrator",
+           "ReportData",
+           "KubeCommandHelper",
+           "BasicPodSummary",
+           "MeshData",
+           "PodSummary",
+           "CustomResourceSummary",
+           "MeshResources",
+           "CommonTask",
+           "CsvTask",
+           "FileTask",
+           "IgdTask",
+           "MeshReportTask",
+           "MeshResourcesTask",
+           "NamespacesTask",
+           "PodTask",
+           "ResourceTask",
+           "MeshTask",
+           "VdbTask",
+           "Event",
+           "OperationType",
+           "EventType",
+           "TaskOrchestrator",
+           "TaskRequestType",
+           "TaskConfiguration",
+           "TaskRequest",
+           "PodTaskRequest",
+           "ResourceTaskRequest",
+           "MeshReportTaskRequest",
+           "VdbTaskRequest",
+           "IgdTaskRequest",
+           "NamespacesTaskRequest",
+           "FileTaskRequest",
+           "CsvTaskRequest",
+           "MeshResourcesTaskRequest",
+           "CommonTaskRequest",
+           "ObservabilityTask",
+           "ObservabilityTaskRequest",
+           "WebhooksTask",
+           "WebhooksTaskRequest",
+           "ValidateCrdsTask",
+           "ValidateCrdsTaskRequest",
+           "BundleAnalyser"
+           ]