IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-23 23:13:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disables Azure PostgreSQL cloud deployment in Server mode.

Browse Source 
refs #7506
This commit is contained in:
Yogesh Mahajan 2022-06-28 18:48:41 +05:30 committed by Akshay Joshi
parent 524626b895
commit 64e1e004ae
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/en_US/cloud_azure_postgresql.rst
View File

@ -23,15 +23,15 @@ browser or Azure CLI. Azure CLI will use the currently logged in identity
through the Azure CLI on the local machine. Interactive Browser will
open a browser window to authenticate a user interactively.
Use the *Azure tenant* id to speicify Azure tenant ID against which user
is aunthenticated.
Use the *Azure tenant* id to specify Azure tenant ID against which user
is authenticated.
Clicking the *Click here to authenticate yourself to Microsoft Azure*
button, user will be redirected to the Microsoft Azure authentication page in a
new browser tab if the Interactive Browser option is selected.
Azure CLI authentication can be used only in Desktop mode.
Once authentication is comepleted, click on the next button to proceed.
Once authentication is completed, click on the next button to proceed.
.. image:: images/cloud_azure_instance.png
:alt: Cloud Deployment
@ -52,10 +52,10 @@ details.
* Select the location to deploy PostgreSQL instance from *Location*
options.
* Select the availablity zone in specified region to deploy PostgreSQL
* Select the availability zone in specified region to deploy PostgreSQL
instance from *Availability zone* options.
* Use *Database version* options to speicify PostgreSQL database vetsion.
* Use *Database version* options to specify PostgreSQL database version.
* Use the *Instance class* field to allocate the computational, network, and
memory capacity required by planned workload of this DB instance.

7
web/pgadmin/misc/cloud/__init__.py
View File

@ -27,6 +27,7 @@ from pgadmin.misc.cloud.biganimal import deploy_on_biganimal,\
clear_biganimal_session
from pgadmin.misc.cloud.rds import deploy_on_rds, clear_aws_session
from pgadmin.misc.cloud.azure import deploy_on_azure, clear_azure_session
import config
# set template path for sql scripts
MODULE_NAME = 'cloud'
@ -135,7 +136,11 @@ def deploy_on_cloud():
elif data['cloud'] == 'biganimal':
status, resp = deploy_on_biganimal(data)
elif data['cloud'] == 'azure':
status, resp = deploy_on_azure(data)
if config.SERVER_MODE:
status = False
resp = gettext('Invalid Operation for Server mode.')
else:
status, resp = deploy_on_azure(data)
else:
status = False
resp = gettext('No cloud implementation.')

7
web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
View File

@ -325,6 +325,11 @@ export default function CloudWizard({ nodeInfo, nodeData }) {
setErrMsg([]);
});
let cloud_providers = [{label: 'Amazon RDS', value: 'rds', icon: <AWSIcon className={classes.icon} />}, {label: 'EDB BigAnimal', value: 'biganimal', icon: <BigAnimalIcon className={classes.icon} />}];
if (pgAdmin.server_mode == 'False'){
cloud_providers.push({'label': 'Azure PostgreSQL', value: 'azure', icon: <AzureIcon className={classes.icon} /> });
}
return (
<CloudWizardEventsContext.Provider value={eventBus.current}>
<>
@ -342,7 +347,7 @@ export default function CloudWizard({ nodeInfo, nodeData }) {
</Box>
<Box className={classes.messageBox}>
<ToggleButtons cloudProvider={cloudProvider} setCloudProvider={setCloudProvider}
options={[{label: 'Amazon RDS', value: 'rds', icon: <AWSIcon className={classes.icon} />}, {label: 'EDB BigAnimal', value: 'biganimal', icon: <BigAnimalIcon className={classes.icon} />}, {'label': 'Azure PostgreSQL', value: 'azure', icon: <AzureIcon className={classes.icon} /> }]}
options={cloud_providers}
></ToggleButtons>
</Box>
<FormFooterMessage type={errMsg[0]} message={errMsg[1]} onClose={onErrClose} />