Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/actions/droplet_create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def create(app, message, user_audit_info)

DropletModel.db.transaction do
droplet.save
droplet.buildpack_lifecycle_data = VCAP::CloudController::BuildpackLifecycleDataModel.create(
VCAP::CloudController::BuildpackLifecycleDataModel.create(
droplet:
)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module VCAP::CloudController
class AppBuildpackLifecycle < AppBaseLifecycle
def create_lifecycle_data_model(app)
app.buildpack_lifecycle_data = BuildpackLifecycleDataModel.create(
BuildpackLifecycleDataModel.create(
buildpacks: buildpacks,
stack: stack,
credentials: message.buildpack_data.credentials,
Expand Down
2 changes: 1 addition & 1 deletion lib/cloud_controller/diego/lifecycles/app_cnb_lifecycle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module VCAP::CloudController
class AppCNBLifecycle < AppBaseLifecycle
def create_lifecycle_data_model(app)
app.cnb_lifecycle_data = CNBLifecycleDataModel.create(
CNBLifecycleDataModel.create(
buildpacks: buildpacks,
stack: stack,
credentials: message.buildpack_data.credentials,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def type
end

def create_lifecycle_data_model(build)
build.buildpack_lifecycle_data = VCAP::CloudController::BuildpackLifecycleDataModel.create(
VCAP::CloudController::BuildpackLifecycleDataModel.create(
buildpacks: Array(buildpacks_to_use),
stack: staging_stack,
build: build
Expand Down
2 changes: 1 addition & 1 deletion lib/cloud_controller/diego/lifecycles/cnb_lifecycle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def type
end

def create_lifecycle_data_model(build)
build.cnb_lifecycle_data = VCAP::CloudController::CNBLifecycleDataModel.create(
VCAP::CloudController::CNBLifecycleDataModel.create(
buildpacks: Array(buildpacks_to_use),
stack: staging_stack,
build: build,
Expand Down
2 changes: 2 additions & 0 deletions spec/request/apps_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1881,6 +1881,7 @@
let(:app_model) { create(:app_model, space: space, name: 'my-app') }
let(:build) do
create(:build_model,
:no_lifecycle_data,
package: package,
app: app_model,
staging_memory_in_mb: 123,
Expand All @@ -1892,6 +1893,7 @@
end
let!(:second_build) do
create(:build_model,
:no_lifecycle_data,
package: package,
app: app_model,
staging_memory_in_mb: 123,
Expand Down
3 changes: 3 additions & 0 deletions spec/request/builds_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@
describe 'GET /v3/builds' do
let(:build) do
create(:build_model,
:no_lifecycle_data,
package: package,
app: app_model,
created_by_user_name: 'bob the builder',
Expand All @@ -384,6 +385,7 @@
end
let!(:second_build) do
create(:build_model,
:no_lifecycle_data,
package: second_package,
app: app_model,
created_at: build.created_at - 1.day,
Expand Down Expand Up @@ -588,6 +590,7 @@
describe 'GET /v3/builds/:guid' do
let(:build) do
create(:build_model,
:no_lifecycle_data,
package: package,
app: app_model,
staging_memory_in_mb: 123,
Expand Down
7 changes: 7 additions & 0 deletions spec/support/factory_definitions/app_model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
lifecycle { :cnb }
end

# For specs that create the lifecycle data themselves (e.g.
# #create_lifecycle_data_model); avoids a colliding pre-existing row.
trait :no_lifecycle_data do
lifecycle_type { VCAP::CloudController::BuildpackLifecycleDataModel::LIFECYCLE_TYPE }
lifecycle { :none }
end

trait :all_fields do
association :droplet, factory: :droplet_model
buildpack_cache_sha256_checksum { generate(:guid) }
Expand Down
7 changes: 7 additions & 0 deletions spec/support/factory_definitions/build_model.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@
state { VCAP::CloudController::BuildModel::STAGING_STATE }
association :app, factory: %i[app_model cnb]
end

# For specs that create the lifecycle data themselves (e.g.
# #create_lifecycle_data_model); avoids a colliding pre-existing row.
trait :no_lifecycle_data do
lifecycle_type { VCAP::CloudController::BuildpackLifecycleDataModel::LIFECYCLE_TYPE }
lifecycle { :none }
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module VCAP::CloudController
it_behaves_like 'custom-stack lifecycle updates', 'buildpack', 'https://example.com/buildpack.zip'

describe '#create_lifecycle_data_model' do
let!(:app) { create(:app_model) }
let!(:app) { create(:app_model, :no_lifecycle_data) }

it 'creates BuildpackLifecycleDataModel' do
expect do
Expand Down Expand Up @@ -192,7 +192,7 @@ module VCAP::CloudController
context 'when credentials are provided' do
let(:creds) { { 'git.example.com' => { 'username' => 'u', 'password' => 'p' } } }
let(:lifecycle_request_data) { { buildpacks: ['http://git.example.com/acme/bp.git'], credentials: creds } }
let!(:app) { create(:app_model) }
let!(:app) { create(:app_model, :no_lifecycle_data) }

it 'stores credentials on the lifecycle data model' do
lifecycle.create_lifecycle_data_model(app)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module VCAP::CloudController
it_behaves_like 'custom-stack lifecycle updates', 'cnb', 'docker://registry.example.com/team/buildpack:latest'

describe '#create_lifecycle_data_model' do
let!(:app) { create(:app_model) }
let!(:app) { create(:app_model, :no_lifecycle_data) }

it 'creates CNBLifecycleDataModel' do
expect do
Expand Down
Loading