Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(jans-linux-setup): drop couchbase support #10133

Merged
merged 3 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions jans-linux-setup/jans_setup/jans_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ def ami_packaged():
from setup_app.installers.jans_auth import JansAuthInstaller

if base.current_app.profile == 'jans':
from setup_app.installers.couchbase import CouchbaseInstaller
from setup_app.installers.scim import ScimInstaller
from setup_app.installers.fido import FidoInstaller
from setup_app.installers.jans_link import JansLinkInstaller
Expand Down Expand Up @@ -248,10 +247,6 @@ def ami_packaged():
jreInstaller = JreInstaller()
jettyInstaller = JettyInstaller()
jythonInstaller = JythonInstaller()

if Config.profile == 'jans':
couchbaseInstaller = CouchbaseInstaller()

rdbmInstaller = RDBMInstaller()
httpdinstaller = HttpdInstaller()
jansAuthInstaller = JansAuthInstaller()
Expand All @@ -270,10 +265,6 @@ def ami_packaged():

rdbmInstaller.packageUtils = packageUtils

if not Config.installed_instance:
Config.set_mapping_locations()


if Config.installed_instance:

if argsp.enable_script:
Expand Down Expand Up @@ -348,10 +339,6 @@ def main():
if Config.rdbm_install_type == static.InstallTypes.LOCAL:
packageUtils.check_and_install_packages()

if Config.cb_install == static.InstallTypes.LOCAL:
print("Please wait while setup is installing couchbase package ...")
couchbaseInstaller.couchbaseInstall()

# register post setup progress
class PostSetup:
service_name = 'post-setup'
Expand Down Expand Up @@ -395,12 +382,6 @@ def do_installation():
jansInstaller.copy_output()
jansInstaller.setup_init_scripts()

# Installing jans components
if Config.profile == 'jans':

if Config.cb_install:
couchbaseInstaller.start_installation()

if Config.rdbm_install:
rdbmInstaller.start_installation()

Expand Down
18 changes: 0 additions & 18 deletions jans-linux-setup/jans_setup/setup_app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ class Config:
def get(self, attr, default=None):
return getattr(self, attr) if hasattr(self, attr) else default

@classmethod
def set_mapping_locations(self):
ptype = 'rdbm' if self.persistence_type in ('sql',) else self.persistence_type
self.mapping_locations = { group: ptype for group in self.couchbaseBucketDict }

@classmethod
def dump(self, dumpFile=False):
if self.dump_config_on_error:
Expand Down Expand Up @@ -147,15 +142,10 @@ def progress(self, service_name, msg, incr=False):

#passwords
self.admin_password = ''
self.cb_password = None
self.encoded_cb_password = ''

#DB installation types
self.cb_install = InstallTypes.NONE
self.rdbm_install = InstallTypes.LOCAL

self.couchbase_buckets = []

#rdbm
self.rdbm_install_type = InstallTypes.LOCAL
self.rdbm_type = 'pgsql'
Expand Down Expand Up @@ -247,7 +237,6 @@ def progress(self, service_name, msg, incr=False):
# reflect final path if the file must be copied after its rendered.

self.jans_python_readme = os.path.join(self.jansOptPythonFolder, 'libs/python.txt')
self.jansCouchebaseProperties = os.path.join(self.configFolder, 'jans-couchbase.properties')
self.jansRDBMProperties = os.path.join(self.configFolder, 'jans-sql.properties')

self.ldif_base = os.path.join(self.output_dir, 'base.ldif')
Expand Down Expand Up @@ -320,11 +309,4 @@ def progress(self, service_name, msg, incr=False):
'jans_auth_client_jar_fn': os.path.join(self.dist_jans_dir, 'jans-auth-client-jar-with-dependencies.jar')
}

#re-map couchbase buckets ldif
for bucket in self.couchbaseBucketDict:
for i, ldifs in enumerate(self.couchbaseBucketDict[bucket]['ldif']):
self.couchbaseBucketDict[bucket]['ldif'][i] = getattr(self, ldifs)

self.mapping_locations = { group: 'rdbm' for group in self.couchbaseBucketDict }

Config.addPostSetupService = []

This file was deleted.

Loading
Loading