From 967f4d5ed229e4c2ed00f7aa1e380d678c86c85c Mon Sep 17 00:00:00 2001
From: Durand Fabrice <oeufdure@gmail.com>
Date: Tue, 29 Jun 2021 10:58:15 -0400
Subject: [PATCH] Removed reference to Azure and Google cloud

---
 .../pfappserver/Form/Config/Cloud/Azure.pm    | 45 --------------
 .../pfappserver/Form/Config/Cloud/Google.pm   | 45 --------------
 .../Configuration/_components/CloudsList.vue  |  3 -
 .../clouds/_components/FormTypeAzure.vue      | 61 -------------------
 .../clouds/_components/FormTypeGoogle.vue     | 60 ------------------
 .../clouds/_components/TheForm.vue            |  8 ---
 .../src/views/Configuration/clouds/config.js  |  2 -
 lib/pf/UnifiedApi/Controller/Config/Clouds.pm |  4 --
 lib/pf/constants/cloud.pm                     |  2 -
 9 files changed, 230 deletions(-)
 delete mode 100644 html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm
 delete mode 100644 html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm
 delete mode 100644 html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue
 delete mode 100644 html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue

diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm
deleted file mode 100644
index 61048ab9b84e..000000000000
--- a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-package pfappserver::Form::Config::Cloud::Azure;
-
-=head1 NAME
-
-pfappserver::Form::Config::Cloud::Azure - Web form to add a Microsoft Azure service
-
-=head1 DESCRIPTION
-
-Form definition to create or update a Microsoft Azure service.
-
-=cut
-
-use HTML::FormHandler::Moose;
-extends 'pfappserver::Form::Config::Cloud';
-with 'pfappserver::Base::Form::Role::Help';
-
-=over
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright (C) 2005-2021 Inverse inc.
-
-=head1 LICENSE
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-USA.
-
-=cut
-
-__PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"};
-1;
diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm
deleted file mode 100644
index 6acf0b92f62a..000000000000
--- a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-package pfappserver::Form::Config::Cloud::Google;
-
-=head1 NAME
-
-pfappserver::Form::Config::Cloud::Google - Web form to add a google service
-
-=head1 DESCRIPTION
-
-Form definition to create or update a Google service.
-
-=cut
-
-use HTML::FormHandler::Moose;
-extends 'pfappserver::Form::Config::Cloud';
-with 'pfappserver::Base::Form::Role::Help';
-
-=over
-
-=back
-
-=head1 COPYRIGHT
-
-Copyright (C) 2005-2021 Inverse inc.
-
-=head1 LICENSE
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-USA.
-
-=cut
-
-__PACKAGE__->meta->make_immutable unless $ENV{"PF_SKIP_MAKE_IMMUTABLE"};
-1;
diff --git a/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue b/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue
index 6e38ae00da34..b97fba04be03 100644
--- a/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue
+++ b/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue
@@ -11,9 +11,6 @@
       </template>
       <template v-slot:buttonAdd>
         <b-dropdown :text="$t('New Cloud')" variant="outline-primary">
-<!--          <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Azure' } }">Microsoft Azure</b-dropdown-item>
-          <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Google' } }">Google Cloud</b-dropdown-item>
--->
           <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Intune' } }">Microsoft Intune</b-dropdown-item>
         </b-dropdown>
       </template>
diff --git a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue b/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue
deleted file mode 100644
index e96287933eb0..000000000000
--- a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <base-form
-    :form="form"
-    :meta="meta"
-    :schema="schema"
-    :isLoading="isLoading"
-  >
-    <form-group-identifier namespace="id"
-      :column-label="$i18n.t('Name')"
-      :disabled="!isNew && !isClone"
-    />
-
-<!--
-    <form-group-tenant-id namespace="tenant_id"
-      :column-label="$i18n.t('The tenant ID of the Azure service')"
-      :text="$i18n.t('Define the tenant ID defined in the Azure admin portal.')"
-    />
-
-    <form-group-client-id namespace="client_id"
-      :column-label="$i18n.t('The client ID of the Azure service')"
-      :text="$i18n.t('Define the client ID defined in the Azure admin portal.')"
-    />
-
-    <form-group-client-secret namespace="client_secret"
-      :column-label="$i18n.t('The client secret of the Azure service')"
-      :text="$i18n.t('Define the client secret defined in the Azure admin portal.')"
-    />
-
--->
-
-  </base-form>
-</template>
-<script>
-import { BaseForm } from '@/components/new/'
-import {
-  FormGroupIdentifier,
-  FormGroupTenantId,
-  FormGroupClientId,
-  FormGroupClientSecret,
-} from './'
-
-const components = {
-  BaseForm,
-
-  FormGroupIdentifier,
-  FormGroupTenantId,
-  FormGroupClientId,
-  FormGroupClientSecret,
-}
-
-import { useForm as setup, useFormProps as props } from '../_composables/useForm'
-
-// @vue/component
-export default {
-  name: 'form-type-intune',
-  inheritAttrs: false,
-  components,
-  props,
-  setup
-}
-</script>
diff --git a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue b/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue
deleted file mode 100644
index dd7a1c1611fe..000000000000
--- a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <base-form
-    :form="form"
-    :meta="meta"
-    :schema="schema"
-    :isLoading="isLoading"
-  >
-    <form-group-identifier namespace="id"
-      :column-label="$i18n.t('Name')"
-      :disabled="!isNew && !isClone"
-    />
-
-<!--
-    <form-group-tenant-id namespace="tenant_id"
-      :column-label="$i18n.t('The tenant ID of the Google service')"
-      :text="$i18n.t('Define the tenant ID defined in the Azure admin portal.')"
-    />
-
-    <form-group-client-id namespace="client_id"
-      :column-label="$i18n.t('The client ID of the Google service')"
-      :text="$i18n.t('Define the client ID defined in the Azure admin portal.')"
-    />
-
-    <form-group-client-secret namespace="client_secret"
-      :column-label="$i18n.t('The client secret of the Google service')"
-      :text="$i18n.t('Define the client secret defined in the Azure admin portal.')"
-    />
--->
-
-  </base-form>
-</template>
-<script>
-import { BaseForm } from '@/components/new/'
-import {
-  FormGroupIdentifier,
-  FormGroupTenantId,
-  FormGroupClientId,
-  FormGroupClientSecret,
-} from './'
-
-const components = {
-  BaseForm,
-
-  FormGroupIdentifier,
-  FormGroupTenantId,
-  FormGroupClientId,
-  FormGroupClientSecret,
-}
-
-import { useForm as setup, useFormProps as props } from '../_composables/useForm'
-
-// @vue/component
-export default {
-  name: 'form-type-intune',
-  inheritAttrs: false,
-  components,
-  props,
-  setup
-}
-</script>
diff --git a/html/pfappserver/root/src/views/Configuration/clouds/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/clouds/_components/TheForm.vue
index 3c08269079bb..1b5fd77b9dba 100644
--- a/html/pfappserver/root/src/views/Configuration/clouds/_components/TheForm.vue
+++ b/html/pfappserver/root/src/views/Configuration/clouds/_components/TheForm.vue
@@ -18,15 +18,11 @@
 </template>
 <script>
 import { BaseContainerLoading } from '@/components/new/'
-import FormTypeAzure from './FormTypeAzure'
-import FormTypeGoogle from './FormTypeGoogle'
 import FormTypeIntune from './FormTypeIntune'
 
 const components = {
   BaseContainerLoading,
 
-  FormTypeAzure,
-  FormTypeGoogle,
   FormTypeIntune,
 }
 
@@ -48,10 +44,6 @@ export const setup = (props) => {
   const formType = computed(() => {
     const { type } = unref(form)
     switch(type) {
-      case 'Azure':
-        return FormTypeAzure // break
-      case 'Google':
-        return FormTypeGoogle // break
       case 'Intune':
         return FormTypeIntune // break
       default:
diff --git a/html/pfappserver/root/src/views/Configuration/clouds/config.js b/html/pfappserver/root/src/views/Configuration/clouds/config.js
index c8ddcd66a5e3..b3b99bebbe96 100644
--- a/html/pfappserver/root/src/views/Configuration/clouds/config.js
+++ b/html/pfappserver/root/src/views/Configuration/clouds/config.js
@@ -1,8 +1,6 @@
 import i18n from '@/utils/locale'
 
 export const types = {
-  Azure:      i18n.t('Azure'),
-  Google:     i18n.t('Google'),
   Intune:     i18n.t('Intune'),
 }
 
diff --git a/lib/pf/UnifiedApi/Controller/Config/Clouds.pm b/lib/pf/UnifiedApi/Controller/Config/Clouds.pm
index 7596da9ff306..bb9b58d76f8d 100644
--- a/lib/pf/UnifiedApi/Controller/Config/Clouds.pm
+++ b/lib/pf/UnifiedApi/Controller/Config/Clouds.pm
@@ -23,14 +23,10 @@ has 'primary_key' => 'cloud_id';
 
 use pf::ConfigStore::Cloud;
 use pfappserver::Form::Config::Cloud;
-use pfappserver::Form::Config::Cloud::Azure;
-use pfappserver::Form::Config::Cloud::Google;
 use pfappserver::Form::Config::Cloud::Intune;
 
 our %TYPES_TO_FORMS = (
     map { $_ => "pfappserver::Form::Config::Cloud::$_" } qw(
-      Azure
-      Google
       Intune
     )
 );
diff --git a/lib/pf/constants/cloud.pm b/lib/pf/constants/cloud.pm
index a428f45b7a3e..a6c8b7e0328b 100644
--- a/lib/pf/constants/cloud.pm
+++ b/lib/pf/constants/cloud.pm
@@ -18,8 +18,6 @@ use base qw(Exporter);
 use Readonly;
 
 Readonly::Scalar our $CLOUD_TYPES => [
-    "Azure",
-    "Google",
     "Intune",
 ];