Skip to content

Commit

Permalink
removing apav_deploy since it is not used either
Browse files Browse the repository at this point in the history
  • Loading branch information
josehelps committed Jun 25, 2024
1 parent a6db215 commit 0938b42
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 268 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ apps*
test_results*
attack_data*
security_content/
contentctl.yml

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down
98 changes: 0 additions & 98 deletions contentctl/actions/apav_deploy.py

This file was deleted.

151 changes: 0 additions & 151 deletions contentctl/actions/api_deploy.py

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion contentctl/actions/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def inspectAppAPI(self, config: inspect)->str:
if not package_path.is_file():
raise Exception(f"Cannot run Appinspect API on App '{config.app.title}' - "
f"no package exists as expected path '{package_path}'.\nAre you "
"trying to 'contentctl acs_deploy' the package BEFORE running 'contentctl build'?")
"trying to 'contentctl deploy_acs' the package BEFORE running 'contentctl build'?")

files = {
"app_package": open(package_path,"rb"),
Expand Down
13 changes: 3 additions & 10 deletions contentctl/contentctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import tyro

from contentctl.actions.initialize import Initialize
from contentctl.objects.config import init, validate, build, new, deploy_acs, deploy_rest, test, test_servers, inspect, report, test_common, release_notes
from contentctl.objects.config import init, validate, build, new, deploy_acs, test, test_servers, inspect, report, test_common, release_notes
from contentctl.actions.validate import Validate
from contentctl.actions.new_content import NewContent
from contentctl.actions.detection_testing.GitService import GitService
Expand Down Expand Up @@ -96,11 +96,7 @@ def new_func(config:new):

def deploy_acs_func(config:deploy_acs):
#This is a bit challenging to get to work with the default values.
raise Exception("deploy acs not yet implemented")

def deploy_rest_func(config:deploy_rest):
raise Exception("deploy rest not yet implemented")

raise Exception("deploy acs not yet implemented")

def test_common_func(config:test_common):
director_output_dto = build_func(config)
Expand Down Expand Up @@ -176,8 +172,7 @@ def main():
"test":test.model_validate(config_obj),
"test_servers":test_servers.model_construct(**t.__dict__),
"release_notes": release_notes.model_construct(**config_obj),
"deploy_acs": deploy_acs.model_construct(**t.__dict__),
#"deploy_rest":deploy_rest()
"deploy_acs": deploy_acs.model_construct(**t.__dict__)
}
)

Expand Down Expand Up @@ -210,8 +205,6 @@ def main():
elif type(config) == deploy_acs:
updated_config = deploy_acs.model_validate(config)
deploy_acs_func(updated_config)
elif type(config) == deploy_rest:
deploy_rest_func(config)
elif type(config) == test or type(config) == test_servers:
if type(config) == test:
#construct the container Infrastructure objects
Expand Down
8 changes: 0 additions & 8 deletions contentctl/objects/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,6 @@ class Infrastructure(BaseModel):
instance_name: str = Field(...)


class deploy_rest(build):
model_config = ConfigDict(use_enum_values=True,validate_default=True, arbitrary_types_allowed=True)

target:Infrastructure = Infrastructure(instance_name="splunk_target_host", instance_address="localhost")
#This will overwrite existing content without promprting for confirmation
overwrite_existing_content:bool = Field(default=True, description="Overwrite existing macros and savedsearches in your enviornment")


class Container(Infrastructure):
model_config = ConfigDict(use_enum_values=True,validate_default=True, arbitrary_types_allowed=True)
instance_address:str = Field(default="localhost", description="Address of your splunk server.")
Expand Down

0 comments on commit 0938b42

Please sign in to comment.