fix examples and github workflows

afbase · afbase · commit a7a9371a8c7e · 2025-07-23T23:56:52.000-07:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,16 +1,57 @@
 version: 2
 updates:
+  # Cargo dependencies
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
       interval: "weekly"
       day: "monday"
-      time: "09:00"
+      time: "10:00"
+      timezone: "America/New_York"
     open-pull-requests-limit: 10
     reviewers:
-      - "your-username"  # Replace with actual username
+      - "blacksky-algorithms"
     assignees:
-      - "your-username"  # Replace with actual username
+      - "blacksky-algorithms"
     commit-message:
       prefix: "deps"
-      include: "scope"
+      prefix-development: "deps(dev)"
+      include: "scope"
+    labels:
+      - "dependencies"
+      - "rust"
+    allow:
+      # Allow all dependency updates
+      - dependency-type: "all"
+    # Group minor and patch updates together to reduce PR volume
+    groups:
+      rust-dependencies:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+
+  # GitHub Actions dependencies
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "10:30"
+      timezone: "America/New_York"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "blacksky-algorithms"
+    assignees:
+      - "blacksky-algorithms"
+    commit-message:
+      prefix: "ci"
+      include: "scope"
+    labels:
+      - "dependencies"
+      - "github-actions"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,27 @@ env:
   RUST_BACKTRACE: 1
 
 jobs:
+  msrv:
+    name: Minimum Supported Rust Version (MSRV)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Install Rust MSRV
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.70.0  # Must match rust-version in Cargo.toml
+          
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+        
+      - name: Check MSRV
+        run: cargo check --all-targets --all-features
+        
+      - name: Test MSRV
+        run: cargo test --all-features
+
   check-style:
     name: Check Style
     runs-on: ubuntu-latest
@@ -152,8 +173,71 @@ jobs:
       - name: Install Rust stable
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Install cargo-audit
-        run: cargo install cargo-audit
+      - name: Security audit
+        uses: rustsec/audit-check@v1.4.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  sbom:
+    name: Software Bill of Materials (SBOM)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+        
+      - name: Install cargo-cyclonedx
+        run: cargo install cargo-cyclonedx
+        
+      - name: Generate SBOM (JSON)
+        run: cargo cyclonedx --format json --output-file rsdo-sbom.json
+        
+      - name: Upload SBOM JSON artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rsdo-sbom-json
+          path: rsdo-sbom.json
+          retention-days: 30
+          
+      - name: Generate SBOM (XML)
+        run: cargo cyclonedx --format xml --output-file rsdo-sbom.xml
+        
+      - name: Upload SBOM XML artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rsdo-sbom-xml
+          path: rsdo-sbom.xml
+          retention-days: 30
 
-      - name: Run security audit
-        run: cargo audit
+  coverage:
+    name: Code Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: llvm-tools-preview
+          
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+        
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+        
+      - name: Generate code coverage
+        run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
+        
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: lcov.info
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -341,5 +341,51 @@ jobs:
           tag_name: ${{ needs.check-and-release.outputs.tag_name }}
           files: target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
           fail_on_unmatched_files: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  generate-sbom:
+    name: Generate and Attach SBOM
+    runs-on: ubuntu-latest
+    needs: check-and-release
+    if: needs.check-and-release.outputs.should_release == 'true'
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.check-and-release.outputs.tag_name }}
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Cache cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-sbom-cargo-${{ hashFiles('Cargo.lock') }}
+
+      - name: Install cargo-cyclonedx
+        run: cargo install cargo-cyclonedx
+
+      - name: Generate SBOM (JSON)
+        run: |
+          cargo cyclonedx --format json --output-file rsdo-sbom-${{ needs.check-and-release.outputs.version }}.json
+
+      - name: Generate SBOM (XML)
+        run: |
+          cargo cyclonedx --format xml --output-file rsdo-sbom-${{ needs.check-and-release.outputs.version }}.xml
+
+      - name: Upload SBOM files to release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ needs.check-and-release.outputs.tag_name }}
+          files: |
+            rsdo-sbom-${{ needs.check-and-release.outputs.version }}.json
+            rsdo-sbom-${{ needs.check-and-release.outputs.version }}.xml
+          fail_on_unmatched_files: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,10 +5,11 @@ edition = "2021"
 authors = ["Clinton Bowen <clinton.bowen@gmail.com>"]
 description = "A Rust client library for the DigitalOcean API"
 license = "Apache-2.0"
-repository = "https://https://github.com/blacksky-algorithms/rsdo"
+repository = "https://github.com/blacksky-algorithms/rsdo"
 documentation = "https://docs.rs/rsdo"
 keywords = ["digitalocean", "api", "client", "async"]
 categories = ["api-bindings", "web-programming::http-client"]
+rust-version = "1.85.1"
 
 [dependencies]
 progenitor-client = "0.11.0"
@@ -33,4 +34,4 @@ reqwest = { version = "0.12", features = ["blocking", "json"] }
 zip = "2.1"
 
 [dev-dependencies]
-tokio = { version = "1.0", features = ["full"] }
+tokio = { version = "1.0", features = ["full"] }
diff --git a/README.md b/README.md
@@ -8,6 +8,9 @@
 [![Crates.io](https://img.shields.io/crates/v/rsdo.svg)](https://crates.io/crates/rsdo)
 [![Documentation](https://docs.rs/rsdo/badge.svg)](https://docs.rs/rsdo)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
+[![CI](https://github.com/blacksky-algorithms/rsdo/workflows/CI/badge.svg)](https://github.com/blacksky-algorithms/rsdo/actions/workflows/ci.yml)
+[![MSRV](https://img.shields.io/badge/MSRV-1.70.0-blue.svg)](https://github.com/blacksky-algorithms/rsdo#minimum-supported-rust-version-msrv)
+[![Codecov](https://codecov.io/gh/blacksky-algorithms/rsdo/branch/main/graph/badge.svg)](https://codecov.io/gh/blacksky-algorithms/rsdo)
 
 A comprehensive, type-safe Rust client for the DigitalOcean API, automatically generated from the official OpenAPI specification using [progenitor](https://github.com/oxidecomputer/progenitor).
 
@@ -361,6 +364,31 @@ Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for gui
 - **Documentation**: Help improve our examples and documentation
 - **Features**: Suggest new features or improvements
 
+## Minimum Supported Rust Version (MSRV)
+
+**Current MSRV**: `1.70.0`
+
+### MSRV Policy
+
+This crate follows an aggressive MSRV policy to take advantage of the latest Rust language features, performance improvements, and safety enhancements:
+
+- ✅ **MSRV can be raised at any time** for new features, safety improvements, or maintainability
+- ✅ **MSRV increases will result in a semver minor release** (not patch)
+- ✅ **We will always document MSRV changes** in release notes and changelog
+- ✅ **No advance warning period** - we adopt new language features as soon as they're beneficial
+
+### For Users
+
+- If you need to support older Rust versions, **pin to a specific version range** in your `Cargo.toml`:
+  ```toml
+  [dependencies]
+  rsdo = ">=1.0.0, <1.2.0"  # Example: avoid MSRV bumps in 1.2.0+
+  ```
+- Check the [`rust-version`](https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field) field in our `Cargo.toml` for the current MSRV
+- Our CI automatically tests against the declared MSRV to ensure compatibility
+
+This policy allows us to provide the safest, most performant, and maintainable DigitalOcean client possible by leveraging the latest Rust ecosystem improvements.
+
 ## API Reference
 
 Full API documentation is available at [docs.rs/rsdo](https://docs.rs/rsdo).
diff --git a/examples/create_droplet.rs b/examples/create_droplet.rs
@@ -19,7 +19,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // First, let's check available regions and sizes
     println!("📍 Checking available regions...");
-    let regions = client.regions_list().await?;
+    let regions = client.regions_list(None, None).await?;
     let available_regions: Vec<_> = regions.into_inner().regions
         .into_iter()
         .filter(|r| r.available)
@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("Available regions: {}", available_regions.join(", "));
 
     println!("\n💾 Checking available sizes...");
-    let sizes = client.sizes_list().await?;
+    let sizes = client.sizes_list(None, None).await?;
     let small_sizes: Vec<_> = sizes.into_inner().sizes
         .into_iter()
         .filter(|s| s.memory <= 2048) // Only show smaller sizes
@@ -41,17 +41,19 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("Available sizes: {}", small_sizes.join(", "));
 
     // Create droplet configuration
-    let droplet_name = format!("rsdo-example-{}", chrono::Utc::now().timestamp());
+    let droplet_name = format!("rsdo-example-{}", std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs());
     
-    let create_request = DropletCreate {
-        name: droplet_name.clone(),
-        region: "nyc1".to_string(),
+    let create_request = DropletsCreateBody::SingleDropletRequest {
+        name: droplet_name.clone().parse()?,
+        region: Some("nyc1".to_string()),
         size: "s-1vcpu-1gb".to_string(),
-        image: DropletCreateImage::Slug("ubuntu-22-04-x64".to_string()),
-        ssh_keys: None,
-        backups: Some(false),
-        ipv6: Some(true),
-        monitoring: Some(true),
+        image: SingleDropletRequestImage::Variant0("ubuntu-22-04-x64".to_string()),
+        ssh_keys: vec![],
+        backups: false,
+        ipv6: true,
+        monitoring: true,
+        private_networking: false,
+        backup_policy: None,
         tags: Some(vec![
             "rsdo".to_string(),
             "example".to_string(),
@@ -64,7 +66,7 @@ apt-get update
 apt-get install -y curl
 "#.to_string(),
         ),
-        volumes: None,
+        volumes: vec![],
         vpc_uuid: None,
         with_droplet_agent: Some(true),
     };
@@ -77,29 +79,27 @@ apt-get install -y curl
     let response = client.droplets_create(&create_request).await?;
     let new_droplet = response.into_inner();
 
-    println!("\n✅ Droplet created successfully!");
-    println!("   ID: {}", new_droplet.droplet.id);
-    println!("   Name: {}", new_droplet.droplet.name);
-    println!("   Status: {}", new_droplet.droplet.status);
-    println!("   Created: {}", new_droplet.droplet.created_at);
+    match new_droplet {
+        DropletsCreateResponse::SingleDropletResponse { droplet, .. } => {
+            println!("\n✅ Droplet created successfully!");
+            println!("   ID: {}", droplet.id);
+            println!("   Name: {}", droplet.name);
+            println!("   Status: {}", droplet.status);
+            println!("   Created: {}", droplet.created_at);
 
-    // If there are associated actions, show them
-    if !new_droplet.actions.is_empty() {
-        println!("\n⚡ Associated actions:");
-        for action in &new_droplet.actions {
-            println!("   - {} ({}): {}", 
-                action.type_, 
-                action.id,
-                action.status
-            );
+            println!("\n💡 The droplet is being created. You can check its status with:");
+            println!("   cargo run --example get_droplet {}", droplet.id);
+
+            println!("\n⚠️  Remember to delete this droplet when you're done to avoid charges:");
+            println!("   cargo run --example delete_droplet {}", droplet.id);
+        }
+        DropletsCreateResponse::MultipleDropletResponse { droplets, .. } => {
+            println!("\n✅ Multiple droplets created successfully!");
+            for droplet in droplets {
+                println!("   ID: {}, Name: {}", droplet.id, droplet.name);
+            }
         }
     }
 
-    println!("\n💡 The droplet is being created. You can check its status with:");
-    println!("   cargo run --example get_droplet {}", new_droplet.droplet.id);
-
-    println!("\n⚠️  Remember to delete this droplet when you're done to avoid charges:");
-    println!("   cargo run --example delete_droplet {}", new_droplet.droplet.id);
-
     Ok(())
 }
diff --git a/examples/get_account.rs b/examples/get_account.rs
diff --git a/examples/list_droplets.rs b/examples/list_droplets.rs
