fix: AWS supported

Author: nicholas-cecere

.gitignore

@@ -42,3 +42,29 @@ terraform-provider-litellm
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+# Go specific
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+*.test
+*.out
+go.work
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+
+# Log files
+*.log
+
+# Environment files
+.env

README.md

@@ -1,13 +1,7 @@
 # LiteLLM Terraform Provider
 
-[![Build Status](https://github.com/bitop/terraform-provider-litellm/workflows/tests/badge.svg)](https://github.com/bitop/terraform-provider-litellm/actions)
-
 This Terraform provider allows you to manage LiteLLM resources through Infrastructure as Code. It provides support for managing models, teams, and team members via the LiteLLM REST API.
 
-## Documentation
-
-Full documentation is available on the [Terraform Registry](https://registry.terraform.io/providers/bitop/litellm/latest/docs).
-
 ## Features
 
 - Manage LiteLLM model configurations
@@ -27,28 +21,29 @@ Full documentation is available on the [Terraform Registry](https://registry.ter
 terraform {
   required_providers {
     litellm = {
-      source  = "bitop/litellm"
+      source  = "local/litellm/litellm"
       version = "1.0.0"
     }
   }
 }
 
 provider "litellm" {
-  api_base = "http://your-litellm-instance:4000"
-  api_key  = "your-api-key"
+  api_base = var.litellm_api_base
+  api_key  = var.litellm_api_key
 }
 
-# Example model configuration
-resource "litellm_model" "gpt4" {
-  model_name          = "gpt-4-proxy"
-  custom_llm_provider = "openai"
-  model_api_key       = "sk-your-api-key"
-  model_api_base      = "https://api.openai.com/v1"
-  api_version         = "2023-05-15"
-  base_model         = "gpt-4"
-  tier               = "paid"
-  tpm                = 100000
-  rpm                = 1000
+# Example model configuration for AWS Bedrock
+resource "litellm_model" "claude_aws_bedrock" {
+  model_name            = "claude-3.5-sonnet-v2"
+  custom_llm_provider   = "bedrock"
+  base_model            = "anthropic.claude-3-5-sonnet-20241022-v2:0"
+  tier                  = "paid"
+  aws_access_key_id     = var.aws_access_key_id
+  aws_secret_access_key = var.aws_secret_access_key
+  aws_region_name       = var.aws_region
+
+  input_cost_per_million_tokens  = 4.0
+  output_cost_per_million_tokens = 16.0
 }
 ```
 
@@ -58,7 +53,7 @@ resource "litellm_model" "gpt4" {
 
 1. Clone the repository
 ```sh
-git clone https://github.com/bitop/terraform-provider-litellm.git
+git clone https://github.com/your-username/terraform-provider-litellm.git
 ```
 
 2. Enter the repository directory
@@ -86,3 +81,9 @@ Contributions are welcome! Please read our [contributing guidelines](CONTRIBUTIN
 ## License
 
 This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
+
+## Notes
+
+- Always use environment variables or secure secret management solutions to handle sensitive information like API keys and AWS credentials.
+- Refer to the `examples/` directory for more detailed usage examples.
+- Make sure to keep your provider version updated for the latest features and bug fixes.

examples/model-test/.terraform.lock.hcl

@@ -1,7 +1,8 @@
 terraform {
   required_providers {
     litellm = {
-      source = "local/litellm/litellm"
+      source  = "registry.terraform.io/local/litellm"
+      version = "1.0.0"
     }
   }
 }
@@ -22,25 +23,37 @@ variable "litellm_api_key" {
   sensitive   = true
 }
 
-resource "litellm_model" "test_model" {
-  model_name          = "test-azure-gpt4"
-  custom_llm_provider = "azure"
-  base_model          = "gpt-4"
-  model_api_key       = var.model_api_key
-  model_api_base      = var.model_api_base
-  api_version         = "2023-05-15"
-  rpm                 = 50
-  tpm                 = 80000
-  tier                = "free"
+variable "aws_access_key_id" {
+  type        = string
+  description = "AWS Access Key ID"
+  sensitive   = true
 }
 
-variable "model_api_key" {
+variable "aws_secret_access_key" {
   type        = string
-  description = "Model API Key"
+  description = "AWS Secret Access Key"
   sensitive   = true
 }
 
-variable "model_api_base" {
+variable "aws_region" {
   type        = string
-  description = "Model API Base URL"
+  description = "AWS Region"
+  default     = "us-west-2"
+}
+
+resource "litellm_model" "test_aws_bedrock_model" {
+  model_name            = "claude-3.5-sonnet-v2"
+  custom_llm_provider   = "bedrock"
+  base_model            = "anthropic.claude-3-5-sonnet-20241022-v2:0"
+  tier                  = "paid"
+  aws_access_key_id     = var.aws_access_key_id
+  aws_secret_access_key = var.aws_secret_access_key
+  aws_region_name       = var.aws_region
+
+  input_cost_per_million_tokens  = 4.0
+  output_cost_per_million_tokens = 16.0
+}
+
+output "model_id" {
+  value = litellm_model.test_aws_bedrock_model.id
 }

examples/model-test/README.md

@@ -1,4 +1,5 @@
-litellm_api_base = "https://your-litellm-api-base"
+litellm_api_base = "http://localhost:4000"
 litellm_api_key  = "your-litellm-api-key"
-model_api_key    = "your-model-api-key"
-model_api_base   = "https://your-model-api-base"
+aws_access_key_id = "your-aws-access-key-id"
+aws_secret_access_key = "your-aws-secret-access-key"
+aws_region = "us-west-2"

examples/model-test/main.tf

@@ -4,6 +4,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
 )
 
+// main is the entry point for the plugin. It serves the provider
+// using the Terraform plugin SDK.
 func main() {
 	plugin.Serve(&plugin.ServeOpts{
 		ProviderFunc: Provider,

examples/model-test/terraform.tfvars.example

@@ -4,11 +4,13 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+// ProviderConfig holds the configuration for the LiteLLM provider
 type ProviderConfig struct {
 	APIBase string
 	APIKey  string
 }
 
+// Provider returns a terraform.ResourceProvider.
 func Provider() *schema.Provider {
 	return &schema.Provider{
 		ResourcesMap: map[string]*schema.Resource{
@@ -20,18 +22,21 @@ func Provider() *schema.Provider {
 				Required:    true,
 				Sensitive:   false,
 				DefaultFunc: schema.EnvDefaultFunc("LITELLM_API_BASE", nil),
+				Description: "The base URL of the LiteLLM API",
 			},
 			"api_key": {
 				Type:        schema.TypeString,
 				Required:    true,
 				Sensitive:   true,
 				DefaultFunc: schema.EnvDefaultFunc("LITELLM_API_KEY", nil),
+				Description: "The API key for authenticating with LiteLLM",
 			},
 		},
 		ConfigureFunc: providerConfigure,
 	}
 }
 
+// providerConfigure configures the provider with the given schema data.
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := ProviderConfig{
 		APIBase: d.Get("api_base").(string),

main.go

@@ -25,6 +25,9 @@ type LiteLLMParams struct {
 	Model              string                 `json:"model,omitempty"`
 	InputCostPerToken  float64                `json:"input_cost_per_token,omitempty"`
 	OutputCostPerToken float64                `json:"output_cost_per_token,omitempty"`
+	AWSAccessKeyID     string                 `json:"aws_access_key_id,omitempty"`
+	AWSSecretAccessKey string                 `json:"aws_secret_access_key,omitempty"`
+	AWSRegionName      string                 `json:"aws_region_name,omitempty"`
 	Additional         map[string]interface{} `json:"additionalProp1,omitempty"`
 }
 
@@ -119,6 +122,20 @@ func resourceLiteLLMModel() *schema.Resource {
 				Optional: true,
 				Default:  0.0,
 			},
+			"aws_access_key_id": {
+				Type:      schema.TypeString,
+				Optional:  true,
+				Sensitive: true,
+			},
+			"aws_secret_access_key": {
+				Type:      schema.TypeString,
+				Optional:  true,
+				Sensitive: true,
+			},
+			"aws_region_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -199,6 +216,9 @@ func createOrUpdateModel(d *schema.ResourceData, m interface{}, isUpdate bool) e
 			Model:              modelName,
 			InputCostPerToken:  inputCostPerToken,
 			OutputCostPerToken: outputCostPerToken,
+			AWSAccessKeyID:     d.Get("aws_access_key_id").(string),
+			AWSSecretAccessKey: d.Get("aws_secret_access_key").(string),
+			AWSRegionName:      d.Get("aws_region_name").(string),
 		},
 		ModelInfo: ModelInfo{
 			ID:        modelID,
@@ -287,6 +307,9 @@ func resourceLiteLLMModelRead(d *schema.ResourceData, m interface{}) error {
 	d.Set("api_version", modelResp.LiteLLMParams.APIVersion)
 	d.Set("base_model", modelResp.ModelInfo.BaseModel)
 	d.Set("tier", modelResp.ModelInfo.Tier)
+	d.Set("aws_access_key_id", modelResp.LiteLLMParams.AWSAccessKeyID)
+	d.Set("aws_secret_access_key", modelResp.LiteLLMParams.AWSSecretAccessKey)
+	d.Set("aws_region_name", modelResp.LiteLLMParams.AWSRegionName)
 
 	return nil
 }