Expire packages in create/update hooks

* ensures that Docker packages are also expired

Author: jochenehret

app/models/runtime/package_model.rb

@@ -30,6 +30,18 @@ class PackageModel < Sequel::Model(:packages)
 
     set_field_as_encrypted :docker_password, salt: :docker_password_salt, column: :encrypted_docker_password
 
+    def after_create
+      super
+      BitsExpiration.new.expire_packages!(app) if ready?
+    end
+
+    def after_update
+      super
+      return unless column_changed?(:state)
+
+      BitsExpiration.new.expire_packages!(app) if ready?
+    end
+
     def validate
       validates_max_length 5_000, :docker_password, message: 'can be up to 5,000 characters', allow_nil: true
       validates_includes PACKAGE_STATES, :state, allow_missing: true

lib/cloud_controller/packager/package_upload_handler.rb

@@ -21,8 +21,6 @@ def pack
         end
 
         package.succeed_upload!(checksums)
-
-        VCAP::CloudController::BitsExpiration.new.expire_packages!(package.app)
       ensure
         FileUtils.rm_f(@uploaded_files_path) if @uploaded_files_path
       end