jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-03-10 15:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename Scaleway default project id option (#346)

Browse Source
This commit is contained in:
Benjamin
2021-08-26 15:22:56 +02:00
committed by GitHub
parent 0f3a52f345
commit 030c736174
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scaleway/bootstrap/tf-default-vars.j2.tf
View File

@@ -49,9 +49,9 @@ variable "organization_id" {
type = string
}
variable "scaleway_default_project_id" {
description = "Scaleway default project ID ID"
default = "{{ scaleway_default_project_id }}"
variable "scaleway_project_id" {
description = "Scaleway project ID (namespace)"
default = "{{ scaleway_project_id }}"
type = string
}

2
lib/scaleway/bootstrap/tf-providers.j2.tf
View File

@@ -35,7 +35,7 @@ terraform {
provider "scaleway" {
access_key = var.scaleway_access_key
secret_key = var.scaleway_secret_key
project_id = var.scaleway_default_project_id
project_id = var.scaleway_project_id
zone = var.zone
region = var.region
}

11
src/cloud_provider/scaleway/kubernetes/mod.rs
View File

@@ -51,7 +51,7 @@ pub struct KapsuleOptions {
pub engine_version_controller_token: String,
// Scaleway
pub scaleway_default_project_id: String,
pub scaleway_project_id: String,
pub scaleway_access_key: String,
pub scaleway_secret_key: String,
pub scaleway_default_zone: u8,
@@ -72,7 +72,7 @@ impl KapsuleOptions {
grafana_admin_password: String,
agent_version_controller_token: String,
engine_version_controller_token: String,
scaleway_default_project_id: String,
scaleway_project_id: String,
scaleway_access_key: String,
scaleway_secret_key: String,
scaleway_default_zone: u8,
@@ -89,7 +89,7 @@ impl KapsuleOptions {
grafana_admin_password,
agent_version_controller_token,
engine_version_controller_token,
scaleway_default_project_id,
scaleway_project_id,
scaleway_access_key,
scaleway_secret_key,
scaleway_default_zone,
@@ -170,10 +170,7 @@ impl<'a> Kapsule<'a> {
let mut context = TeraContext::new();
// Scaleway
context.insert(
"scaleway_default_project_id",
self.options.scaleway_default_project_id.as_str(),
);
context.insert("scaleway_project_id", self.options.scaleway_project_id.as_str());
context.insert("scaleway_access_key", self.options.scaleway_access_key.as_str());
context.insert("scaleway_secret_key", self.options.scaleway_secret_key.as_str());
context.insert(