Skip to content

Commit

Permalink
Update to Rust v1.57.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rickporter-tuono authored Dec 7, 2021
1 parent f49f875 commit 8367f24
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CI: true
RUST_BACKTRACE: 1
# This needs to match the RUST_VERSION in create-draft-release.yml.
RUST_VERSION: 1.54.0
RUST_VERSION: 1.57.0

# These are based on pre-configured integrations in the CLI CI account.
CLOUDTRUTH_TEST_BROKEN_PROJECT: proj-int-broken
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ env:
PROJECT_NAME: cloudtruth
RUST_BACKTRACE: 1
# This needs to match the RUST_VERSION in ci.yml.
RUST_VERSION: 1.54.0
RUST_VERSION: 1.57.0

jobs:
create-release:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
CLOUDTRUTH_SERVER_URL: https://api.staging.cloudtruth.io
CLOUDTRUTH_API_KEY: ${{ secrets.CI_ACCT_STAGING_CONTRIBUTOR }}
RUST_BACKTRACE: 1
RUST_VERSION: 1.54.0
RUST_VERSION: 1.57.0

# These are based on pre-configured integrations in the CLI CI account.
CLOUDTRUTH_TEST_BROKEN_PROJECT: proj-int-broken
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
CI: true
RUST_BACKTRACE: 1
# This needs to match the RUST_VERSION in create-draft-release.yml.
RUST_VERSION: 1.54.0
RUST_VERSION: 1.57.0

# These are based on pre-configured integrations in the CLI CI account.
CLOUDTRUTH_TEST_BROKEN_PROJECT: proj-int-broken
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
CLOUDTRUTH_SERVER_URL: https://api.staging.cloudtruth.io
CLOUDTRUTH_API_KEY: ${{ secrets.CI_ACCT_STAGING_CONTRIBUTOR }}
RUST_BACKTRACE: 1
RUST_VERSION: 1.54.0
RUST_VERSION: 1.57.0

CLOUDTRUTH_TEST_BASIC_INTEGRATION_NAME: ct-stage-write@943604981792
CLOUDTRUTH_TEST_BASIC_BAD_INTEGRATION_NAME: my-missing-integration
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

os_name := $(shell uname -s)
rustup_exists := $(shell which rustup)
rust_intended := 1.54.0
rust_intended := 1.57.0
rust_installed := $(shell rustc -V | cut -d' ' -f2)
rust_bad_version := $(shell grep "RUST_VERSION:" .github/workflows/*.yml | grep -v "$(rust_intended)")
unchecked_results := $(shell grep -nA 1 "self\.run_cli" tests/pytest/*.py | grep -v run_cli | grep -v "\-\-" | grep -v assertResult)
Expand Down
19 changes: 1 addition & 18 deletions src/config/profiles.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize};

#[derive(Clone, Deserialize, Debug, PartialEq, Serialize)]
#[derive(Clone, Deserialize, Debug, PartialEq, Serialize, Default)]
#[serde(default)]
pub struct Profile {
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -41,23 +41,6 @@ pub struct ProfileDetails {
pub rest_page_size: Option<i32>,
}

impl Default for Profile {
fn default() -> Self {
Self {
api_key: None,
description: None,
environment: None,
project: None,
request_timeout: None,
server_url: None,
source_profile: None,
rest_debug: None,
rest_success: vec![],
rest_page_size: None,
}
}
}

fn empty_to_none(value: &Option<String>) -> Option<String> {
match value {
Some(x) => match x.is_empty() {
Expand Down

0 comments on commit 8367f24

Please sign in to comment.