Fixes #32896 - Extract Environment GraphQL

ezr-ondrej · Jun 30, 2021 · bbabdd5 · bbabdd5
1 parent cb65583
commit bbabdd5
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 20 deletions.
diff --git a/app/graphql/mutations/hosts/create.rb b/app/graphql/mutations/hosts/create.rb
@@ -17,7 +17,6 @@ class Create < CreateMutation
       argument :owner_id, ID, loads: Types::UserOrUsergroupUnion
       argument :location_id, ID, loads: Types::Location
       argument :organization_id, ID, loads: Types::Organization
-      argument :environment_id, ID, loads: Types::Environment
       argument :architecture_id, ID, loads: Types::Architecture
       argument :domain_id, ID, loads: Types::Domain
       argument :operatingsystem_id, ID, loads: Types::Operatingsystem

diff --git a/app/graphql/types/host.rb b/app/graphql/types/host.rb
@@ -24,7 +24,6 @@ class Host < BaseObject
     belongs_to :compute_resource, Types::ComputeResource
     belongs_to :domain, Types::Domain
     belongs_to :ptable, Types::Ptable
-    belongs_to :environment, Types::Environment
     belongs_to :location, Types::Location
     belongs_to :organization, Types::Organization
     belongs_to :model, Types::Model

diff --git a/app/graphql/types/hostgroup.rb b/app/graphql/types/hostgroup.rb
@@ -11,7 +11,6 @@ class Hostgroup < BaseObject
     belongs_to :architecture, Types::Architecture
     belongs_to :compute_resource, Types::ComputeResource
     belongs_to :domain, Types::Domain
-    belongs_to :environment, Types::Environment
     belongs_to :operatingsystem, Types::Operatingsystem
     belongs_to :puppet_ca_proxy, Types::SmartProxy
     belongs_to :puppet_proxy, Types::SmartProxy

diff --git a/app/graphql/types/location.rb b/app/graphql/types/location.rb
@@ -7,7 +7,6 @@ class Location < BaseObject
     field :name, String
     field :title, String
 
-    has_many :environments, Types::Environment
     has_many :hosts, Types::Host
   end
 end
diff --git a/app/graphql/types/organization.rb b/app/graphql/types/organization.rb
@@ -6,7 +6,5 @@ class Organization < BaseObject
     timestamps
     field :name, String
     field :title, String
-
-    has_many :environments, Types::Environment
   end
 end
diff --git a/app/graphql/types/query.rb b/app/graphql/types/query.rb
@@ -71,9 +71,6 @@ def collection_field(name, type)
     record_field :fact_value, Types::FactValue
     collection_field :fact_values, Types::FactValue
 
-    record_field :environment, Types::Environment
-    collection_field :environments, Types::Environment
-
     record_field :compute_resource, Types::ComputeResource
     collection_field :compute_resources, Types::ComputeResource
 

diff --git a/test/fixtures/taxable_taxonomies.yml b/test/fixtures/taxable_taxonomies.yml
@@ -9,16 +9,6 @@ four:
   taxable: one
   taxable_type: "SmartProxy"
 
-five:
-  taxonomy: location1
-  taxable: production
-  taxable_type: "Environment"
-
-six:
-  taxonomy: organization1
-  taxable: production
-  taxable_type: "Environment"
-
 seven:
   taxonomy: location1
   taxable: mydomain
@@ -212,4 +202,4 @@ bmc_organization:
 bmc_location1:
   taxonomy: location1
   taxable: bmc
-  taxable_type: "SmartProxy"
+  taxable_type: "SmartProxy"