kuby-kube-db 0.3.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f182e8a41ccccbf1a4420e57afb7ad46937355d362d17e56df1c3871100aa9e
-  data.tar.gz: b82611c381d553229b8584b3583c2c6f6be88f92c96af942cd801d17bd47d024
+  metadata.gz: 0eb811de37c1d31869e60816db656816532bfac247b19abcf9d0036ab5ddc95c
+  data.tar.gz: 73467e22e8d5be095fffb4f7d9ab0dbecb88560bfdcf710a56c7c6c241f19e3c
 SHA512:
-  metadata.gz: 30873e1aea3775239355d5c74607f9a2345087167588d022ef78902faeebf9755858e72612c703ffe9f70c7217716ad59cacc50769cb7233176504a0de492582
-  data.tar.gz: 82cddc258d9c3c4a61cb194312af36cf9785b241a6c7252717de0db698bc35b8558c2afd090c26df2b173f005df67b1a6c94893c315e43d71ebeb3afb8f889e8
+  metadata.gz: 87499ebb4c0e6a713b0955c86def01cb4c7520b7a113a0763017aae1a294bb6efe5706a6d60e32030ff60106aabf4d0a6c6085a7304013f93eab6f188931d0d6
+  data.tar.gz: 45a5c060121248003e0084a645a5abc3904e8199c56a78c9efccd1a593f3dd2c94b9363e0f14f59f8d1b886336598ed893b6f12621178cc5242c6d6336fc2244

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.6.2
+* Fix bad constant references
+
+## 0.6.1
+* Pass keyword arguments correctly to helm-cli (#1, @rept)
+
+## 0.6.0
+* Wait for API resources to become available.
+  - Krane queries k8s for API resources which causes kubectl to exit with a non-zero status code if KubeDB's operator isn't finished spinning up.
+
+## 0.5.0
+* Conform to new plugin architecture.
+* Accept `environment` instead of `definition` instances.
+
+## 0.4.0
+* Downgrade to kubedb 0.12.0, the latest stable release.
+  - For some reason, the API spec for 0.13.0.rc-0 was removed from the apimachinery repo.
+  - Other rcs in the 0.13.0 line, eg. 0.13.0.rc-1 are not published as Helm charts.
+* Upgrade to helm-cli 0.2.
+
 ## 0.3.0
 * Upgrade to kube-dsl 0.3.
 

data/kuby-kube-db.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.platform = Gem::Platform::RUBY
 
-  s.add_dependency 'helm-cli', '~> 0.1'
+  s.add_dependency 'helm-cli', '~> 0.3'
   s.add_dependency 'kube-dsl', '~> 0.3'
 
   s.require_path = 'lib'

data/lib/kuby/kube-db/dsl.rb

@@ -1,7 +1,9 @@
 module Kuby::KubeDB::DSL
   autoload :Catalog, 'kuby/kube-db/dsl/catalog'
   autoload :Kubedb, 'kuby/kube-db/dsl/kubedb'
+  autoload :Authorization, 'kuby/kube-db/dsl/authorization'
   autoload :Api, 'kuby/kube-db/dsl/api'
-  autoload :Appcatalog, 'kuby/kube-db/dsl/appcatalog'
+  autoload :Meta, 'kuby/kube-db/dsl/meta'
   autoload :V1, 'kuby/kube-db/dsl/v1'
+  autoload :Appcatalog, 'kuby/kube-db/dsl/appcatalog'
 end

data/lib/kuby/kube-db/dsl/api/v1.rb

@@ -1,20 +1,18 @@
 module Kuby::KubeDB::DSL::Api::V1
   autoload :RestServerSpec, 'kuby/kube-db/dsl/api/v1/rest_server_spec'
-  autoload :ServiceTemplateSpec, 'kuby/kube-db/dsl/api/v1/service_template_spec'
+  autoload :ServicePort, 'kuby/kube-db/dsl/api/v1/service_port'
+  autoload :LocalSpec, 'kuby/kube-db/dsl/api/v1/local_spec'
   autoload :SwiftSpec, 'kuby/kube-db/dsl/api/v1/swift_spec'
+  autoload :ServiceSpec, 'kuby/kube-db/dsl/api/v1/service_spec'
   autoload :S3Spec, 'kuby/kube-db/dsl/api/v1/s3_spec'
-  autoload :PodTemplateSpec, 'kuby/kube-db/dsl/api/v1/pod_template_spec'
-  autoload :ServiceMonitorSpec, 'kuby/kube-db/dsl/api/v1/service_monitor_spec'
+  autoload :AgentSpec, 'kuby/kube-db/dsl/api/v1/agent_spec'
+  autoload :Backend, 'kuby/kube-db/dsl/api/v1/backend'
   autoload :B2Spec, 'kuby/kube-db/dsl/api/v1/b2_spec'
   autoload :ObjectMeta, 'kuby/kube-db/dsl/api/v1/object_meta'
   autoload :PodSpec, 'kuby/kube-db/dsl/api/v1/pod_spec'
-  autoload :PrometheusExporterSpec, 'kuby/kube-db/dsl/api/v1/prometheus_exporter_spec'
-  autoload :AzureSpec, 'kuby/kube-db/dsl/api/v1/azure_spec'
-  autoload :LocalSpec, 'kuby/kube-db/dsl/api/v1/local_spec'
-  autoload :ServicePort, 'kuby/kube-db/dsl/api/v1/service_port'
-  autoload :Backend, 'kuby/kube-db/dsl/api/v1/backend'
-  autoload :ServiceSpec, 'kuby/kube-db/dsl/api/v1/service_spec'
-  autoload :AgentSpec, 'kuby/kube-db/dsl/api/v1/agent_spec'
+  autoload :PodTemplateSpec, 'kuby/kube-db/dsl/api/v1/pod_template_spec'
   autoload :PrometheusSpec, 'kuby/kube-db/dsl/api/v1/prometheus_spec'
   autoload :GCSSpec, 'kuby/kube-db/dsl/api/v1/gcs_spec'
+  autoload :AzureSpec, 'kuby/kube-db/dsl/api/v1/azure_spec'
+  autoload :ServiceTemplateSpec, 'kuby/kube-db/dsl/api/v1/service_template_spec'
 end

data/lib/kuby/kube-db/dsl/api/v1/local_spec.rb

@@ -6,7 +6,6 @@ module Kuby::KubeDB::DSL::Api::V1
     object_field(:git_repo) { KubeDSL::DSL::V1::GitRepoVolumeSource.new }
     object_field(:flocker) { KubeDSL::DSL::V1::FlockerVolumeSource.new }
     object_field(:storageos) { KubeDSL::DSL::V1::StorageOSVolumeSource.new }
-    object_field(:csi) { KubeDSL::DSL::V1::CSIVolumeSource.new }
     object_field(:iscsi) { KubeDSL::DSL::V1::ISCSIVolumeSource.new }
     object_field(:projected) { KubeDSL::DSL::V1::ProjectedVolumeSource.new }
     object_field(:secret) { KubeDSL::DSL::V1::SecretVolumeSource.new }
@@ -39,7 +38,6 @@ module Kuby::KubeDB::DSL::Api::V1
         result[:gitRepo] = git_repo.serialize
         result[:flocker] = flocker.serialize
         result[:storageos] = storageos.serialize
-        result[:csi] = csi.serialize
         result[:iscsi] = iscsi.serialize
         result[:projected] = projected.serialize
         result[:secret] = secret.serialize

data/lib/kuby/kube-db/dsl/api/v1/object_meta.rb

@@ -1,28 +1,9 @@
 module Kuby::KubeDB::DSL::Api::V1
   class ObjectMeta < ::KubeDSL::DSLObject
-    value_fields :uid, :deletion_timestamp, :cluster_name, :deletion_grace_period_seconds, :namespace, :generation, :finalizers, :generate_name, :resource_version, :creation_timestamp, :self_link, :name
-    array_field(:owner_reference) { KubeDSL::DSL::Meta::V1::OwnerReference.new }
-    array_field(:managed_field) { KubeDSL::DSL::Meta::V1::ManagedFieldsEntry.new }
-    key_value_field(:labels, format: :string)
     key_value_field(:annotations, format: :string)
 
     def serialize
       {}.tap do |result|
-        result[:uid] = uid
-        result[:deletionTimestamp] = deletion_timestamp
-        result[:clusterName] = cluster_name
-        result[:deletionGracePeriodSeconds] = deletion_grace_period_seconds
-        result[:namespace] = namespace
-        result[:generation] = generation
-        result[:finalizers] = finalizers
-        result[:generateName] = generate_name
-        result[:resourceVersion] = resource_version
-        result[:creationTimestamp] = creation_timestamp
-        result[:selfLink] = self_link
-        result[:name] = name
-        result[:ownerReferences] = owner_references.map(&:serialize)
-        result[:managedFields] = managed_fields.map(&:serialize)
-        result[:labels] = labels.serialize
         result[:annotations] = annotations.serialize
       end
     end

data/lib/kuby/kube-db/dsl/api/v1/prometheus_spec.rb

@@ -1,17 +1,13 @@
 module Kuby::KubeDB::DSL::Api::V1
   class PrometheusSpec < ::KubeDSL::DSLObject
-    value_fields :namespace, :interval, :port
-    object_field(:exporter) { Kuby::KubeDB::DSL::Api::V1::PrometheusExporterSpec.new }
-    object_field(:service_monitor) { Kuby::KubeDB::DSL::Api::V1::ServiceMonitorSpec.new }
+    value_fields :namespace, :port, :interval
     key_value_field(:labels, format: :string)
 
     def serialize
       {}.tap do |result|
         result[:namespace] = namespace
-        result[:interval] = interval
         result[:port] = port
-        result[:exporter] = exporter.serialize
-        result[:serviceMonitor] = service_monitor.serialize
+        result[:interval] = interval
         result[:labels] = labels.serialize
       end
     end

data/lib/kuby/kube-db/dsl/api/v1/s3_spec.rb

@@ -1,13 +1,12 @@
 module Kuby::KubeDB::DSL::Api::V1
   class S3Spec < ::KubeDSL::DSLObject
-    value_fields :prefix, :endpoint, :bucket, :region
+    value_fields :prefix, :endpoint, :bucket
 
     def serialize
       {}.tap do |result|
         result[:prefix] = prefix
         result[:endpoint] = endpoint
         result[:bucket] = bucket
-        result[:region] = region
       end
     end
 

data/lib/kuby/kube-db/dsl/api/v1/service_spec.rb

@@ -1,20 +1,18 @@
 module Kuby::KubeDB::DSL::Api::V1
   class ServiceSpec < ::KubeDSL::DSLObject
-    value_fields :load_balancer_ip, :external_i_ps, :external_traffic_policy, :type, :cluster_ip, :load_balancer_source_ranges, :health_check_node_port
+    value_fields :load_balancer_ip, :external_i_ps, :type, :external_traffic_policy, :cluster_ip, :load_balancer_source_ranges, :health_check_node_port
     array_field(:port) { Kuby::KubeDB::DSL::Api::V1::ServicePort.new }
-    object_field(:session_affinity_config) { KubeDSL::DSL::V1::SessionAffinityConfig.new }
 
     def serialize
       {}.tap do |result|
         result[:loadBalancerIP] = load_balancer_ip
         result[:externalIPs] = external_i_ps
-        result[:externalTrafficPolicy] = external_traffic_policy
         result[:type] = type
+        result[:externalTrafficPolicy] = external_traffic_policy
         result[:clusterIP] = cluster_ip
         result[:loadBalancerSourceRanges] = load_balancer_source_ranges
         result[:healthCheckNodePort] = health_check_node_port
         result[:ports] = ports.map(&:serialize)
-        result[:sessionAffinityConfig] = session_affinity_config.serialize
       end
     end
 

data/lib/kuby/kube-db/dsl/authorization.rb

@@ -0,0 +1,3 @@
+module Kuby::KubeDB::DSL::Authorization
+  autoload :V1alpha1, 'kuby/kube-db/dsl/authorization/v1alpha1'
+end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1.rb

@@ -0,0 +1,24 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  autoload :DatabaseAccessRequestSpec, 'kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_spec'
+  autoload :PostgresRoleCondition, 'kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_condition'
+  autoload :DatabaseAccessRequestList, 'kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_list'
+  autoload :RoleReference, 'kuby/kube-db/dsl/authorization/v1alpha1/role_reference'
+  autoload :Lease, 'kuby/kube-db/dsl/authorization/v1alpha1/lease'
+  autoload :MongoDBRoleSpec, 'kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_spec'
+  autoload :DatabaseAccessRequestStatus, 'kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_status'
+  autoload :MySQLRoleSpec, 'kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_spec'
+  autoload :PostgresRoleSpec, 'kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_spec'
+  autoload :MongoDBRoleCondition, 'kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_condition'
+  autoload :PostgresRoleList, 'kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_list'
+  autoload :MongoDBRoleList, 'kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_list'
+  autoload :MySQLRoleStatus, 'kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_status'
+  autoload :DatabaseAccessRequestCondition, 'kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_condition'
+  autoload :MySQLRoleCondition, 'kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_condition'
+  autoload :MySQLRole, 'kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role'
+  autoload :DatabaseAccessRequest, 'kuby/kube-db/dsl/authorization/v1alpha1/database_access_request'
+  autoload :MySQLRoleList, 'kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_list'
+  autoload :MongoDBRoleStatus, 'kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_status'
+  autoload :PostgresRoleStatus, 'kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_status'
+  autoload :MongoDBRole, 'kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role'
+  autoload :PostgresRole, 'kuby/kube-db/dsl/authorization/v1alpha1/postgres_role'
+end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request.rb

@@ -0,0 +1,22 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class DatabaseAccessRequest < ::KubeDSL::DSLObject
+    value_fields :api_version
+    object_field(:status) { Kuby::KubeDB::DSL::Authorization::V1alpha1::DatabaseAccessRequestStatus.new }
+    object_field(:spec) { Kuby::KubeDB::DSL::Authorization::V1alpha1::DatabaseAccessRequestSpec.new }
+    object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
+
+    def serialize
+      {}.tap do |result|
+        result[:kind] = "DatabaseAccessRequest"
+        result[:apiVersion] = api_version
+        result[:status] = status.serialize
+        result[:spec] = spec.serialize
+        result[:metadata] = metadata.serialize
+      end
+    end
+
+    def kind_sym
+      :database_access_request
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_condition.rb

@@ -0,0 +1,18 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class DatabaseAccessRequestCondition < ::KubeDSL::DSLObject
+    value_fields :message, :type, :reason, :last_update_time
+
+    def serialize
+      {}.tap do |result|
+        result[:message] = message
+        result[:type] = type
+        result[:reason] = reason
+        result[:lastUpdateTime] = last_update_time
+      end
+    end
+
+    def kind_sym
+      :database_access_request_condition
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/{catalog/v1alpha1/proxy_sql_version_list.rb → authorization/v1alpha1/database_access_request_list.rb}

@@ -1,12 +1,12 @@
-module Kuby::KubeDB::DSL::Catalog::V1alpha1
-  class ProxySQLVersionList < ::KubeDSL::DSLObject
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class DatabaseAccessRequestList < ::KubeDSL::DSLObject
     value_fields :api_version
-    array_field(:item) { Kuby::KubeDB::DSL::Catalog::V1alpha1::ProxySQLVersion.new }
+    array_field(:item) { Kuby::KubeDB::DSL::Authorization::V1alpha1::DatabaseAccessRequest.new }
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ListMeta.new }
 
     def serialize
       {}.tap do |result|
-        result[:kind] = "ProxySQLVersionList"
+        result[:kind] = "DatabaseAccessRequestList"
         result[:apiVersion] = api_version
         result[:items] = items.map(&:serialize)
         result[:metadata] = metadata.serialize
@@ -14,7 +14,7 @@ module Kuby::KubeDB::DSL::Catalog::V1alpha1
     end
 
     def kind_sym
-      :proxy_sql_version_list
+      :database_access_request_list
     end
   end
 end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_spec.rb

@@ -0,0 +1,19 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class DatabaseAccessRequestSpec < ::KubeDSL::DSLObject
+    value_fields :ttl
+    array_field(:subject) { KubeDSL::DSL::Rbac::V1::Subject.new }
+    object_field(:role_ref) { Kuby::KubeDB::DSL::Authorization::V1alpha1::RoleReference.new }
+
+    def serialize
+      {}.tap do |result|
+        result[:ttl] = ttl
+        result[:subjects] = subjects.map(&:serialize)
+        result[:roleRef] = role_ref.serialize
+      end
+    end
+
+    def kind_sym
+      :database_access_request_spec
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_status.rb

@@ -0,0 +1,19 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class DatabaseAccessRequestStatus < ::KubeDSL::DSLObject
+    array_field(:condition) { Kuby::KubeDB::DSL::Authorization::V1alpha1::DatabaseAccessRequestCondition.new }
+    object_field(:secret) { KubeDSL::DSL::V1::LocalObjectReference.new }
+    object_field(:lease) { Kuby::KubeDB::DSL::Authorization::V1alpha1::Lease.new }
+
+    def serialize
+      {}.tap do |result|
+        result[:conditions] = conditions.map(&:serialize)
+        result[:secret] = secret.serialize
+        result[:lease] = lease.serialize
+      end
+    end
+
+    def kind_sym
+      :database_access_request_status
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/lease.rb

@@ -0,0 +1,17 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class Lease < ::KubeDSL::DSLObject
+    value_fields :duration, :id, :renewable
+
+    def serialize
+      {}.tap do |result|
+        result[:duration] = duration
+        result[:id] = id
+        result[:renewable] = renewable
+      end
+    end
+
+    def kind_sym
+      :lease
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/{kubedb/v1alpha1/proxy_sql.rb → authorization/v1alpha1/mongo_db_role.rb}

@@ -1,13 +1,13 @@
-module Kuby::KubeDB::DSL::Kubedb::V1alpha1
-  class ProxySQL < ::KubeDSL::DSLObject
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class MongoDBRole < ::KubeDSL::DSLObject
     value_fields :api_version
-    object_field(:status) { Kuby::KubeDB::DSL::Kubedb::V1alpha1::ProxySQLStatus.new }
-    object_field(:spec) { Kuby::KubeDB::DSL::Kubedb::V1alpha1::ProxySQLSpec.new }
+    object_field(:status) { Kuby::KubeDB::DSL::Authorization::V1alpha1::MongoDBRoleStatus.new }
+    object_field(:spec) { Kuby::KubeDB::DSL::Authorization::V1alpha1::MongoDBRoleSpec.new }
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
 
     def serialize
       {}.tap do |result|
-        result[:kind] = "ProxySQL"
+        result[:kind] = "MongoDBRole"
         result[:apiVersion] = api_version
         result[:status] = status.serialize
         result[:spec] = spec.serialize
@@ -16,7 +16,7 @@ module Kuby::KubeDB::DSL::Kubedb::V1alpha1
     end
 
     def kind_sym
-      :proxy_sql
+      :mongo_db_role
     end
   end
 end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_condition.rb

@@ -0,0 +1,18 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class MongoDBRoleCondition < ::KubeDSL::DSLObject
+    value_fields :status, :message, :type, :reason
+
+    def serialize
+      {}.tap do |result|
+        result[:status] = status
+        result[:message] = message
+        result[:type] = type
+        result[:reason] = reason
+      end
+    end
+
+    def kind_sym
+      :mongo_db_role_condition
+    end
+  end
+end

data/lib/kuby/kube-db/dsl/{kubedb/v1alpha1/percona_xtra_db_list.rb → authorization/v1alpha1/mongo_db_role_list.rb}

@@ -1,12 +1,12 @@
-module Kuby::KubeDB::DSL::Kubedb::V1alpha1
-  class PerconaXtraDBList < ::KubeDSL::DSLObject
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class MongoDBRoleList < ::KubeDSL::DSLObject
     value_fields :api_version
-    array_field(:item) { Kuby::KubeDB::DSL::Kubedb::V1alpha1::PerconaXtraDB.new }
+    array_field(:item) { Kuby::KubeDB::DSL::Authorization::V1alpha1::MongoDBRole.new }
     object_field(:metadata) { KubeDSL::DSL::Meta::V1::ListMeta.new }
 
     def serialize
       {}.tap do |result|
-        result[:kind] = "PerconaXtraDBList"
+        result[:kind] = "MongoDBRoleList"
         result[:apiVersion] = api_version
         result[:items] = items.map(&:serialize)
         result[:metadata] = metadata.serialize
@@ -14,7 +14,7 @@ module Kuby::KubeDB::DSL::Kubedb::V1alpha1
     end
 
     def kind_sym
-      :percona_xtra_db_list
+      :mongo_db_role_list
     end
   end
 end

data/lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_spec.rb

@@ -0,0 +1,22 @@
+module Kuby::KubeDB::DSL::Authorization::V1alpha1
+  class MongoDBRoleSpec < ::KubeDSL::DSLObject
+    value_fields :revocation_statements, :creation_statements, :max_ttl, :default_ttl
+    object_field(:auth_manager_ref) { Kuby::KubeDB::DSL::Appcatalog::V1alpha1::AppReference.new }
+    object_field(:database_ref) { KubeDSL::DSL::V1::LocalObjectReference.new }
+
+    def serialize
+      {}.tap do |result|
+        result[:revocationStatements] = revocation_statements
+        result[:creationStatements] = creation_statements
+        result[:maxTTL] = max_ttl
+        result[:defaultTTL] = default_ttl
+        result[:authManagerRef] = auth_manager_ref.serialize
+        result[:databaseRef] = database_ref.serialize
+      end
+    end
+
+    def kind_sym
+      :mongo_db_role_spec
+    end
+  end
+end